[Fedora-directory-commits] adminserver/admserv/cgi-src40 ReadLog.c, 1.7, 1.8 config.c, 1.11, 1.12 sec-activate.c, 1.9, 1.10

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246/admserv/cgi-src40

Modified Files:
	ReadLog.c config.c sec-activate.c 
Log Message:
Resolves: 247283
Summary: Fixed multiple problems with CGIs used by Admin Server Console.



Index: ReadLog.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ReadLog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReadLog.c	11 May 2007 19:44:05 -0000	1.7
+++ ReadLog.c	6 Jul 2007 18:06:19 -0000	1.8
@@ -87,15 +87,10 @@
 
 int getLogNames()
 {
-	char line[BIG_LINE];
-    const char *logdir = util_get_log_dir();
+    char line[BIG_LINE];
     const char *configdir = util_get_conf_dir();
-	char filename[BIG_LINE];
-	FILE *f;
-
-    if (!logdir) {
-        return 0;
-    }
+    char filename[BIG_LINE];
+    FILE *f;
 
     if (!util_find_file_in_paths(filename, sizeof(filename), "local.conf",
                                  configdir, "", "admin-serv/config")) {
@@ -112,12 +107,12 @@
 
 			if(PL_strcasestr(line, "nserrorlog"))
 			{
-				PR_snprintf(errorlog, sizeof(errorlog), "%s/%s", logdir, getLogName(line));
+				PR_snprintf(errorlog, sizeof(errorlog), "%s", getLogName(line));
 			}
 			else
 			if(PL_strcasestr(line, "nsaccesslog"))
 			{
-				PR_snprintf(accesslog, sizeof(accesslog), "%s/%s", logdir, getLogName(line));
+				PR_snprintf(accesslog, sizeof(accesslog), "%s", getLogName(line));
 			}
 		}
 		fclose(f);


Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config.c	22 Jun 2007 01:34:19 -0000	1.11
+++ config.c	6 Jul 2007 18:06:19 -0000	1.12
@@ -225,10 +225,6 @@
   if (binddn) rv = ADM_GetCurrentPassword(&err, &bindpw);
 
   adminfo = admldapBuildInfo(configdir, &rv);
-  if (adminfo) {
-    binddn = admldapGetSIEDN(adminfo);
-    bindpw = admldapGetSIEPWD(adminfo);
-  }
 
   errorCode = ADMSSL_InitSimple(configdir, secdir, 0);
   if (errorCode) {


Index: sec-activate.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/sec-activate.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sec-activate.c	11 May 2007 19:44:05 -0000	1.9
+++ sec-activate.c	6 Jul 2007 18:06:19 -0000	1.10
@@ -607,16 +607,6 @@
     ssl3_act = get_cgi_var("ssl3-activated", "", "");
     clientauth = get_cgi_var("clientauth", "", "");
 
-    /* Parse out complete family list */
-    get_family_input(&family_head);
-
-    /* SET SSL VARIABLES via pset  */
-    
-    /* first, cipher family info */
-    SetSSLFamilyAttributes(pset, family_head, ssl2, ssl3, ssl2_act, ssl3_act);
-    
-    set_attribute(pset, "configuration.encryption.nsSSLClientAuth", clientauth);
-
     /* change "security" in LDAP and adm.conf to "on"/"off" */
     set_security(pset, configdir, security);
 
@@ -632,6 +622,14 @@
       char protocols[BIG_LINE];
       char ciphers[BIG_LINE];
 
+      /* Parse out complete family list */
+      get_family_input(&family_head);
+
+      /* set cipher family info */
+      SetSSLFamilyAttributes(pset, family_head, ssl2, ssl3, ssl2_act, ssl3_act);
+
+      set_attribute(pset, "configuration.encryption.nsSSLClientAuth", clientauth);
+
       if  (get_cert_nickname(certnickname, sizeof(certnickname)) < 0) {
         char * scratch = PR_smprintf(getResourceString(DBT_CGI_MISSING_ARGS), certnickname);
         rpt_err(ELEM_MISSING, NULL, scratch, NULL);