r70624 - /trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Mar  6 05:47:24 2011
New Revision: 70624

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70624
Log:
Fix yet more data type problems

Fix cascading issues from changing an internal prototype, and fix the
output lengths from the SASL code, which should still be unsigned ints.

Modified:
    trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size

Modified: trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size?rev=70624&op=diff
==============================================================================
--- trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size (original)
+++ trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size Sun Mar  6 05:47:24 2011
@@ -15,7 +15,77 @@
  {
  	int rc = SASL_OK;
  
-@@ -937,7 +937,7 @@
+@@ -274,7 +274,8 @@
+ int PerlCallback(void *context, int id, const char **result, unsigned *len)
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+-	int llen, rc=SASL_OK;
++	Size_t llen;
++        int rc=SASL_OK;
+ 	char *c = NULL;
+ 
+ 	if (id != SASL_CB_USER &&
+@@ -308,7 +309,8 @@
+ int PerlCallbackRealm ( void *context, int id, const char **availrealms, const char **result)
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+-	int rc = SASL_OK,i,len;
++	int rc = SASL_OK,i;
++	Size_t len;
+ 	char *c = NULL;
+ 
+ 	AV *args = newAV();
+@@ -366,7 +368,8 @@
+ int PerlCallbackSecret (sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+-	int len,rc = SASL_OK;
++	int rc = SASL_OK;
++	Size_t len;
+ 	char *c = NULL;
+ 
+ 	/* HandlePerlStuff */
+@@ -390,7 +393,8 @@
+ 					unsigned *out_ulen)
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+-	int rc = SASL_OK,len;
++	int rc = SASL_OK;
++	Size_t len;
+ 	char *c = NULL;
+ 
+ 	AV *args;
+@@ -433,7 +437,8 @@
+ 	const char *pass, unsigned passlen, struct propctx *propctx)
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+-	int rc = SASL_OK,len;
++	int rc = SASL_OK;
++	Size_t len;
+ 	char *c = NULL;
+ 
+ 	AV *args = newAV();
+@@ -467,7 +472,8 @@
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+ 	AV *args = newAV();
+-	int rc = SASL_OK, len;
++	int rc = SASL_OK;
++	Size_t len;
+ 	char *c = NULL;
+ 
+ 	_DEBUG("ServerSetPass: %s, %s, %d",user,pass,passlen);
+@@ -497,7 +503,8 @@
+ {
+ 	struct _perlcontext *cp = (struct _perlcontext *) context;
+ 	AV *args = newAV();
+-	int rc = SASL_OK,len;
++	int rc = SASL_OK;
++	Size_t len;
+ 	char *c = NULL;
+ 
+ 	_DEBUG("Authorize: %s, %s, %s",auth_identity,requested_user,def_realm);
+@@ -937,7 +944,7 @@
  {
  	char *key;
  	int count=0,i;
@@ -24,48 +94,53 @@
  #ifndef SASL2
  	// Missing SASL1 canonuser workaround
  	int canon=-1,auth=-1;
-@@ -1306,7 +1306,7 @@
+@@ -1306,7 +1313,8 @@
  	const char *instring;
  	PREINIT:
  		int rc;
 -		unsigned outlen,inlen;
-+		Size_t outlen,inlen;
++		Size_t inlen;
++		unsigned int outlen;
  #ifdef SASL2
  		const char *outstring = NULL;
  #else
-@@ -1402,7 +1402,7 @@
+@@ -1402,7 +1410,8 @@
  		const char *error=NULL;
  #endif
  		int rc;
 -		unsigned int inlen, outlen=0;
-+		Size_t inlen, outlen=0;
++		Size_t inlen;
++		unsigned int outlen=0;
  	PPCODE:
  		if (sasl->error_code != SASL_CONTINUE)
  			XSRETURN_UNDEF;
-@@ -1454,7 +1454,7 @@
+@@ -1454,7 +1463,8 @@
      char *outstring=NULL;
  #endif
      int rc;
 -    unsigned int inlen, outlen=0;
-+    Size_t inlen, outlen=0;
++    Size_t inlen;
++    unsigned int outlen=0;
  
      if (sasl->error_code != SASL_CONTINUE)
        XSRETURN_UNDEF;
-@@ -1624,7 +1624,7 @@
+@@ -1624,7 +1634,8 @@
      char *outstring=NULL;
  #endif
      int rc;
 -	unsigned int inlen, outlen=0;
-+	Size_t inlen, outlen=0;
++	Size_t inlen;
++	unsigned int outlen=0;
  	if (sasl->error_code)
  		XSRETURN_UNDEF;
  
-@@ -1652,7 +1652,7 @@
+@@ -1652,7 +1663,8 @@
      char *outstring=NULL;
  #endif
      int rc;
 -    unsigned int inlen, outlen=0;
-+    Size_t inlen, outlen=0;
++    Size_t inlen;
++    unsigned int outlen=0;
  
      if (sasl->error_code)
         XSRETURN_UNDEF;