diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-22 19:45:24 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-22 21:52:19 +0100 |
| commit | 28b4b059386b4369d6ad85c82bbc150aa81609c4 (patch) | |
| tree | c77bef3643b73aa91f3d15d8df62f92982ddfff0 | |
| parent | 823f8b90305e2fe4ef2c391aee8a6d508835d353 (diff) | |
| download | samba-28b4b059386b4369d6ad85c82bbc150aa81609c4.tar.gz samba-28b4b059386b4369d6ad85c82bbc150aa81609c4.tar.bz2 samba-28b4b059386b4369d6ad85c82bbc150aa81609c4.zip | |
s3-includes: move some chgpasswd related defines to the locations where they are used.
Guenther
| -rw-r--r-- | source3/auth/pass_check.c | 6 | ||||
| -rw-r--r-- | source3/include/includes.h | 12 | ||||
| -rw-r--r-- | source3/rpc_server/samr/srv_samr_chgpasswd.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index c61a10ba1b..d3b9b92601 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -25,6 +25,12 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH +/* what is the longest significant password available on your system? + Knowing this speeds up password searches a lot */ +#ifndef PASSWORD_LENGTH +#define PASSWORD_LENGTH 8 +#endif + /* these are kept here to keep the string_combinations function simple */ static char *ths_user; diff --git a/source3/include/includes.h b/source3/include/includes.h index 8276053846..348dda149e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -738,18 +738,6 @@ enum flush_reason_enum { #define OSF1_ENH_SEC 1 #endif -#ifndef ALLOW_CHANGE_PASSWORD -#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) -#define ALLOW_CHANGE_PASSWORD 1 -#endif -#endif - -/* what is the longest significant password available on your system? - Knowing this speeds up password searches a lot */ -#ifndef PASSWORD_LENGTH -#define PASSWORD_LENGTH 8 -#endif - #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) #define ULTRIX_AUTH 1 #endif diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c index 85a63a5630..8a682262df 100644 --- a/source3/rpc_server/samr/srv_samr_chgpasswd.c +++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c @@ -50,6 +50,12 @@ #include "../lib/crypto/arcfour.h" #include "rpc_server/samr/srv_samr_util.h" +#ifndef ALLOW_CHANGE_PASSWORD +#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) +#define ALLOW_CHANGE_PASSWORD 1 +#endif +#endif + #if ALLOW_CHANGE_PASSWORD static int findpty(char **slave) |