CVS gsasl/lib/plain

[gsasl-commit]

Update of /home/cvs/gsasl/lib/plain
In directory dopio:/tmp/cvs-serv8163

Modified Files:
        server.c 
Log Message:
Use SASLprep(authcid) as authzid, when the provided authzid is empty.


--- /home/cvs/gsasl/lib/plain/server.c  2005/02/14 13:27:12     1.22
+++ /home/cvs/gsasl/lib/plain/server.c  2005/02/23 15:05:32     1.23
@@ -73,9 +73,6 @@
       return GSASL_MECHANISM_PARSE_ERROR;
   }
 
-  /* Store authzid. */
-  gsasl_property_set (sctx, GSASL_AUTHZID, authzidptr);
-
   /* Store authid, after preparing it... */
   {
     res = gsasl_saslprep (authidptr, GSASL_ALLOW_UNASSIGNED,
@@ -85,6 +82,12 @@
 
     gsasl_property_set (sctx, GSASL_AUTHID, authidprep);
 
+    /* Store authzid, if absent, use SASLprep(authcid). */
+    if (*authzidptr == '\0')
+      gsasl_property_set (sctx, GSASL_AUTHZID, authidprep);
+    else
+      gsasl_property_set (sctx, GSASL_AUTHZID, authzidptr);
+
     free (authidprep);
   }