Commit 49dd5511 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

hide some unused code on Win32 and NetWare 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089910 13f79535-47bb-0310-9956-ffa450edef68
parent 124106d6

server/util_mutex.c

+2 −0
Changes for server/util_mutex.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ static void log_create_failure(apr_status_t rv, server_rec *s, const char *type, 
                 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_t rv, server_rec *s, const char *type) 
                 "check User and Group directives",

                 type);

}

#endif



AP_DECLARE(apr_status_t) ap_global_mutex_create(apr_global_mutex_t **mutex,

                                                const char **name,

support/htpasswd.c

+12 −4
Changes for support/htpasswd.c: 12 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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, int n) 
        v >>= 6;

    }

}

#endif



static void generate_salt(char *s, size_t size)

{
@@ -209,7 +217,7 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd, 
        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 *record, apr_size_t rlen, char *passwd, 
            free(truncpw);

        }

        break;

#endif

#endif /* CRYPT_ALGO_SUPPORTED */

    }

    memset(pw, '\0', strlen(pw));
@@ -476,14 +484,14 @@ int main(int argc, const char * const argv[]) 
    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);