diff options
| author | Andrew Tridgell <tridge@samba.org> | 1997-10-09 06:36:04 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1997-10-09 06:36:04 +0000 |
| commit | e5494e2c093fecd4b493ab925f7c7d30b79bc98d (patch) | |
| tree | 55dff2810371497a1ac87002ac5cf6ac498c64b0 /source3/include | |
| parent | 1cb2d37d5dff87c73de31aea6a2f4fe2a66b7d39 (diff) | |
| download | samba-e5494e2c093fecd4b493ab925f7c7d30b79bc98d.tar.gz samba-e5494e2c093fecd4b493ab925f7c7d30b79bc98d.tar.bz2 samba-e5494e2c093fecd4b493ab925f7c7d30b79bc98d.zip | |
bracket some macros
change MAX_PASSWORD_LENGTH to MAX_PASS_LEN to prevent conflict on some
systems
add #ifdef around soft link dependent code (for systems that don't
have soft links)
(This used to be commit e10ba4b97a219e87b62d32834bf15ed2e323ed2e)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 8 | ||||
| -rw-r--r-- | source3/include/local.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 4ca1d4c3b0..a877f1ffb3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1114,15 +1114,15 @@ extern char *sys_errlist[]; #endif #ifndef S_ISREG -#define S_ISREG(x) ((S_IFREG & x)!=0) +#define S_ISREG(x) ((S_IFREG & (x))!=0) #endif #ifndef S_ISDIR -#define S_ISDIR(x) ((S_IFDIR & x)!=0) +#define S_ISDIR(x) ((S_IFDIR & (x))!=0) #endif #if !defined(S_ISLNK) && defined(S_IFLNK) -#define S_ISLNK(x) ((S_IFLNK & x)!=0) +#define S_ISLNK(x) ((S_IFLNK & (x))!=0) #endif #ifdef UFC_CRYPT @@ -1202,7 +1202,7 @@ it works and getting lots of bug reports */ /* this is a rough check to see if this machine has a lstat() call. it is not guaranteed to work */ -#if !(defined(S_ISLNK) || defined(S_IFLNK)) +#if !defined(S_ISLNK) #define lstat stat #endif diff --git a/source3/include/local.h b/source3/include/local.h index 3ce75eeb4e..22d1b2a08e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -43,7 +43,7 @@ #define WORDMAX 0xFFFF /* the maximum password length before we declare a likely attack */ -#define MAX_PASSWORD_LENGTH 200 +#define MAX_PASS_LEN 200 /* separators for lists */ #define LIST_SEP " \t,;:\n\r" |