httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1089910 - in /httpd/httpd/trunk: server/util_mutex.c support/htpasswd.c
Date Thu, 07 Apr 2011 15:16:22 GMT
Author: trawick
Date: Thu Apr  7 15:16:20 2011
New Revision: 1089910

URL: http://svn.apache.org/viewvc?rev=1089910&view=rev
Log:
hide some unused code on Win32 and NetWare

Modified:
    httpd/httpd/trunk/server/util_mutex.c
    httpd/httpd/trunk/support/htpasswd.c

Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=1089910&r1=1089909&r2=1089910&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Thu Apr  7 15:16:20 2011
@@ -390,6 +390,7 @@ static void log_create_failure(apr_statu
                  fname ? ")" : "");
 }
 
+#ifdef AP_NEED_SET_MUTEX_PERMS
 static void log_perms_failure(apr_status_t rv, server_rec *s, const char *type)
 {
     ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
@@ -397,6 +398,7 @@ static void log_perms_failure(apr_status
                  "check User and Group directives",
                  type);
 }
+#endif
 
 AP_DECLARE(apr_status_t) ap_global_mutex_create(apr_global_mutex_t **mutex,
                                                 const char **name,

Modified: httpd/httpd/trunk/support/htpasswd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/htpasswd.c?rev=1089910&r1=1089909&r2=1089910&view=diff
==============================================================================
--- httpd/httpd/trunk/support/htpasswd.c (original)
+++ httpd/httpd/trunk/support/htpasswd.c Thu Apr  7 15:16:20 2011
@@ -104,6 +104,13 @@ apr_file_t *ftemp = NULL;
 
 #define NL APR_EOL_STR
 
+#if defined(WIN32) || defined(NETWARE)
+#define CRYPT_ALGO_SUPPORTED 0
+#else
+#define CRYPT_ALGO_SUPPORTED 1
+#endif
+
+#if CRYPT_ALGO_SUPPORTED
 static void to64(char *s, unsigned long v, int n)
 {
     static unsigned char itoa64[] =         /* 0 ... 63 => ASCII - 64 */
@@ -114,6 +121,7 @@ static void to64(char *s, unsigned long 
         v >>= 6;
     }
 }
+#endif
 
 static void generate_salt(char *s, size_t size)
 {
@@ -209,7 +217,7 @@ static int mkrecord(char *user, char *re
         apr_cpystrn(cpw,pw,sizeof(cpw));
         break;
 
-#if (!(defined(WIN32) || defined(NETWARE)))
+#if CRYPT_ALGO_SUPPORTED
     case ALG_CRYPT:
     default:
         if (seed_rand()) {
@@ -229,7 +237,7 @@ static int mkrecord(char *user, char *re
             free(truncpw);
         }
         break;
-#endif
+#endif /* CRYPT_ALGO_SUPPORTED */
     }
     memset(pw, '\0', strlen(pw));
 
@@ -476,14 +484,14 @@ int main(int argc, const char * const ar
     check_args(pool, argc, argv, &alg, &mask, &user, &pwfilename, &password);
 
 
-#if defined(WIN32) || defined(NETWARE)
+#if !CRYPT_ALGO_SUPPORTED
     if (alg == ALG_CRYPT) {
         alg = ALG_APMD5;
         apr_file_printf(errfile, "Automatically using MD5 format." NL);
     }
 #endif
 
-#if (!(defined(WIN32) || defined(NETWARE)))
+#if CRYPT_ALGO_SUPPORTED
     if (alg == ALG_PLAIN) {
         apr_file_printf(errfile,"Warning: storing passwords as plain text "
                         "might just not work on this platform." NL);



Mime
View raw message