diff options
| -rw-r--r-- | source3/include/includes.h | 17 | ||||
| -rw-r--r-- | source3/smbd/password.c | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 94bf23cef5..c9a515af9a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -492,16 +492,22 @@ char *mktemp(char *); /* No standard include */ #endif -#ifdef NETBSD -#include <strings.h> +#ifdef NETBSD +#ifdef NetBSD1_3 +#include <string.h> +#ifdef ALLOW_CHANGE_PASSWORD +#include <termios.h> +#endif /* ALLOW_CHANGE_PASSWORD */ +#else /* NetBSD1_3 */ +#include <strings.h> +#endif /* NetBSD1_3 */ #include <netinet/tcp.h> /* you may not need this */ -#define NO_GETSPNAM +#define NO_GETSPNAM #define SIGNAL_CAST (void (*)()) #define USE_DIRECT #define REPLACE_INNETGR -#endif - +#endif #ifdef FreeBSD @@ -598,6 +604,7 @@ char *mktemp(char *); /* No standard include */ /* Ken Weiss <krweiss@ucdavis.edu> tells us that SIGCLD_IGNORE is not good for HPUX */ /* #define SIGCLD_IGNORE */ +#define USE_SIGPROCMASK /* Needed to stop zombie processes on HPUX 9.x and 10.x.*/ #endif /* HPUX */ diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 212d931e87..c0e89100ea 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -243,6 +243,10 @@ uint16 register_vuid(int uid,int gid, char *name,BOOL guest) user_struct *vuser; struct passwd *pwfile; /* for getting real name from passwd file */ + /* Ensure no vuid gets registered in share level security. */ + if(lp_security() == SEC_SHARE) + return UID_FIELD_INVALID; + #if 0 /* * After observing MS-Exchange services writing to a Samba share |