get*id() don't work on Windows; thanks to OtherBill for pointing

	it out.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91000 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 4600f0a0d91d676134ab4668f48ab32d23ee1c35..0a19501de6a33c9705844773325d6097a53569d8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 1.3 STATUS:                                             -*-text-*-
-  Last modified at [$Date: 2001/09/11 03:11:57 $]
+  Last modified at [$Date: 2001/09/11 03:29:10 $]
 
 Release:
 
@@ -36,8 +36,6 @@ Release:
 
 RELEASE SHOWSTOPPERS:
 
-    mod_auth is now broken on win32, due to the getpwuid changes.
-
     ab is broken on many platforms.  Dirk has offered patch, it does not
     apply cleanly, he has offered to clean this up.
 

diff --git a/src/CHANGES b/src/CHANGES
index 9e3722689382d2585304da7d3c595a421664ba32..f81b0ffce83a27c4e0519d12cbaa1dbfbe907c28 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -8,7 +8,8 @@ Changes with Apache 1.3.21
      username (from the appropriate AuthUserFile database) matches
      the username of the UID that owns the document (and equivalent
      checking for file GID and user's membership in AuthGroupFile).
-     See the mod_auth documentation for examples. [Ken Coar]
+     See the mod_auth documentation for examples.  (Not supported
+     on Windows.)  [Ken Coar]
 
   *) Addition of the AcceptMutex runtime directive. The accept mutex
      method is now runtime controllable. The suite of available methods

diff --git a/src/modules/standard/mod_auth.c b/src/modules/standard/mod_auth.c
index a2abd61009d994e5cb55b2d0bf854d81e8f731b4..fd64d57ad1304dbb71ffdae9c806bb515e9cb7ea 100644 (file)
--- a/src/modules/standard/mod_auth.c
+++ b/src/modules/standard/mod_auth.c
@@ -278,6 +278,11 @@ static int check_user_access(request_rec *r)
          * owner of the document.
          */
        if (strcmp(w, "file-owner") == 0) {
+#if defined(WIN32)
+            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERROR, r,
+                          "'Require file-user' not supported on Windows");
+            return HTTP_UNAUTHORIZED;
+#else
             struct passwd *pwent;
             ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r,
                           "checking for 'owner' access for file '%s'",
@@ -305,8 +310,14 @@ static int check_user_access(request_rec *r)
                     return HTTP_UNAUTHORIZED;
                 }
             }
+#endif
         }
        if (strcmp(w, "file-group") == 0) {
+#if defined(WIN32)
+            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERROR, r,
+                          "'Require file-group' not supported on Windows");
+            return HTTP_UNAUTHORIZED;
+#else
             struct group *grent;
             if (sec->auth_grpfile == NULL) {
                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
@@ -349,6 +360,7 @@ static int check_user_access(request_rec *r)
                     return HTTP_UNAUTHORIZED;
                 }
             }
+#endif
         }
        if (strcmp(w, "user") == 0) {
            while (t[0] != '\0') {