[389-commits] mod_admserv README,1.3,1.4 mod_admserv.c,1.38,1.39

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/mod_admserv
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17203

Modified Files:
	README mod_admserv.c 
Log Message:
this is now obsolete - mod_admserv has been moved into the adminserver source tree


Index: README
===================================================================
RCS file: /cvs/dirsec/mod_admserv/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	7 Oct 2005 21:00:49 -0000	1.3
+++ README	9 Oct 2009 16:16:20 -0000	1.4
@@ -1,3 +1,8 @@
+NOTE: As of October 8, 2009, there is no longer a standalone mod_admserv
+CVS repository.  mod_admserv is now part of the admin server git source
+tree.  The contents of this directory should only be used for historical
+purposes.
+
 mod_admserv - http://directory.fedora.redhat.com/wiki/mod_admserv
 
 mod_admserv provides the HTTP functionality associated with the Fedora Administration Server http://directory.fedora.redhat.com/wiki/AdminServer.  It is a standard Apache module and uses standard Apache build tools and configure.  In addition, you will also need NSPR, NSS, and the LDAP C SDK from Mozilla, as well as the AdminUtil component provided as part of the Fedora DS - http://directory.fedora.redhat.com/wiki/AdminUtil.


Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_admserv.c	28 Jan 2009 00:05:13 -0000	1.38
+++ mod_admserv.c	9 Oct 2009 16:16:21 -0000	1.39
@@ -569,14 +569,25 @@
 static apr_status_t close_pipe(void *thefd)
 {
     int fd = (int)((intptr_t)thefd);
+    int rc;
 
-    return close(fd);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0 /* status */, NULL,
+                 "close_pipe(): closing pipe %d errno %d", fd, errno);
+    errno = 0;
+
+    rc = close(fd);
+
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0 /* status */, NULL,
+                 "close_pipe(): closed pipe rc = %d errno = %d",
+                 rc, errno);
+
+    return rc;
 }
 
 static int password_pipe(request_rec *r)
     {
     apr_table_t *e = r->subprocess_env;
-    int fd;
+    int fd, wfd;
     apr_size_t  nbytes;
     apr_file_t *readp = NULL;
     apr_file_t *writep = NULL;
@@ -619,6 +630,10 @@
 
     /* Get the low-level file descriptor */
     apr_os_file_get(&fd, readp);
+    apr_os_file_get(&wfd, writep);
+
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+                 "password_pipe(): created pipe read %d write %d", fd, wfd);
 
     /* Register a cleanup callback so this gets closed at the end of the
        request. */
@@ -631,9 +646,15 @@
     nbytes = strlen(ans);
     apr_file_write(writep, ans, &nbytes);
 
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+                 "password_pipe(): wrote %d bytes");
+
     /* Close the writing side, we don't need this any more */
     apr_file_close(writep);
 
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+                 "password_pipe(): closed write descriptor");
+
     return 0;
 }
 
@@ -747,7 +768,7 @@
 extractLdapError(const server_rec *s, const char *url)
 {
     ap_log_error(APLOG_MARK, APLOG_ERR, 0 /* status */, s,
-                 "extractLdapServerData(): the LDAP url [%s] is invalid\n",
+                 "extractLdapServerData(): the LDAP url [%s] is invalid",
                  url ? url : "(null)");
     return FALSE;
 }
@@ -2495,6 +2516,8 @@
 
     cf->adminsdk = flag;
 
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "[%d] adminsdk [0x%p] flag %d",
+                 getpid(), cf, flag);
     return NULL;
 }
 
@@ -2612,6 +2635,10 @@
   int             pw_expiring = 0;
   int tries = 0;
 
+  ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
+                "authenticate_user: begin auth user [%s] pw [%s] in [%s] for [%s:%d]",
+                user, pw, baseDN, data->host, data->port);
+
   if (!(server = openLDAPConnection(data)))
       ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
           "unable to open LDAPConnection to server [%s:%d]", data->host, data->port);
@@ -2826,6 +2853,9 @@
     admserv_config *cf = ap_get_module_config(r->per_dir_config,
                                               &admserv_module);
 
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r,
+                 "fixup_adminsdk flag is %d", cf->adminsdk);
+
     if (!cf->adminsdk)
         return DECLINED;