Attachment 158146 Details for Bug 246124 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 1.82 KB, created by Nathan Kinder on 2007-06-28 17:57:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-06-28 17:57:38 UTC

Size: 1.82 KB

patch

obsolete

>Index: lib/libadminutil/admutil.c
>===================================================================
>RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v
>retrieving revision 1.8
>diff -u -5 -t -r1.8 admutil.c
>--- lib/libadminutil/admutil.c	8 May 2007 19:13:25 -0000	1.8
>+++ lib/libadminutil/admutil.c	28 Jun 2007 17:42:43 -0000
>@@ -1245,11 +1245,12 @@
>     break;
>   case 1:
>     /* EOF */
>   default:
>     password = strchr(buf, ':');
>-    *password++ = '\0';
>+    *password = '\0';
>+    *password++;
>     while (*password) {
>       if (*password == ' ') password++;
>       else break;
>     }
>     
>Index: lib/libadmsslutil/srvutilssl.c
>===================================================================
>RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/srvutilssl.c,v
>retrieving revision 1.5
>diff -u -5 -t -r1.5 srvutilssl.c
>--- lib/libadmsslutil/srvutilssl.c	8 May 2007 19:13:26 -0000	1.5
>+++ lib/libadmsslutil/srvutilssl.c	28 Jun 2007 17:42:43 -0000
>@@ -149,12 +149,31 @@
> 
> PR_IMPLEMENT(char *)
> findSIEDNByIDSSL(AdmldapInfo info, const char *serverID)
> {
>   char *retval = NULL;
>+  char *siedn = NULL;
>+  char *userdn = NULL;
>+  char *passwd = NULL;
>+  int rval = 0;
>+
>+  siedn = admldapGetSIEDN(info);
>+  ADM_GetUserDNString(&rval, &userdn);
>+  ADM_GetCurrentPassword(&rval, &passwd);
>+
>+  /* HACK HACK HACK */
>+  /* getServerDNListSSL uses the siedn as the binddn - so we temporarily
>+     replace the siedn with the userdn - fortunately it doesn't use the
>+     siedn as the SIE DN */
>+  admldapSetSIEDN(info, userdn);
>+  admSetCachedSIEPWD(passwd);
>+
>   AttrNameList nl = getServerDNListSSL(info);
> 
>+  /* HACK HACK HACK - reset after getServerDNListSSL */
>+  admldapSetSIEDN(info, siedn);
>+
>   if (nl) {
>     size_t len = strlen(serverID);
>     AttrNameList nlptr = nl;
>     while (retval = *nlptr++) {
>       /* nl is a list of DNs like this:

Actions: View | Diff

Attachments on bug 246124: 158146 | 158149