include/local.h:

include/smb.h:
param/loadparm.c: Made GUEST_SESSSETUP run time selectable. Horror of horrors :-).
printing/printing.c: Added J.F.'s latest fix.
rpc_parse/parse_misc.c:
parse_reg.c:
rpcclient/cmd_reg.c:
rpcclient/display.c: SGI compiler signed/unsigned issues.
smbd/reply.c: Made GUEST_SESSSETUP run time selectable. Horror of horrors :-).
utils/testparm.c: Added extra test.
Jeremy.

4 files changed, 27 insertions, 24 deletions

diff --git a/source/include/local.h b/source/include/local.h
index c609f65342f..e6e2fd4badb 100644
--- a/source/include/local.h
+++ b/source/include/local.h
@@ -104,29 +104,6 @@
 #define PRIME_NMBD 1
 #endif
 
-/* do you want session setups at user level security with a invalid
-   password to be rejected or allowed in as guest? WinNT rejects them
-   but it can be a pain as it means "net view" needs to use a password 
-
-   You have 3 choices:
-
-   GUEST_SESSSETUP = 0 means session setups with an invalid password
-   are rejected.
-
-   GUEST_SESSSETUP = 1 means session setups with an invalid password
-   are rejected, unless the username does not exist, in which case it
-   is treated as a guest login
-
-   GUEST_SESSSETUP = 2 means session setups with an invalid password
-   are treated as a guest login
-
-   Note that GUEST_SESSSETUP only has an effect in user or server
-   level security.
-   */
-#ifndef GUEST_SESSSETUP
-#define GUEST_SESSSETUP 0
-#endif
-
 /* the default pager to use for the client "more" command. Users can
    override this with the PAGER environment variable */
 #ifndef PAGER
diff --git a/source/include/ntdomain.h b/source/include/ntdomain.h
index 5b53834efe5..edbe87ab8d8 100644
--- a/source/include/ntdomain.h
+++ b/source/include/ntdomain.h
@@ -32,7 +32,7 @@
 #include "rpc_misc.h"
 
 /* security descriptor structures */
-#include "rpc_secdes.h"
+#include "rpc_secdes.h" 
 
 /* different dce/rpc pipes */
 #include "rpc_lsa.h"
diff --git a/source/include/proto.h b/source/include/proto.h
index 143f397e0ad..61394c9ad98 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1035,6 +1035,7 @@ int lp_lm_interval(void);
 int lp_machine_password_timeout(void);
 int lp_change_notify_timeout(void);
 int lp_stat_cache_size(void);
+int lp_map_to_guest(void);
 int lp_ldap_port(void);
 char *lp_preexec(int );
 char *lp_postexec(int );
diff --git a/source/include/smb.h b/source/include/smb.h
index a8b0c745b2d..db7b251d65e 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1684,6 +1684,31 @@ struct nmb_name {
 
 #define NEW_PW_FORMAT_SPACE_PADDED_LEN 14
 
+/*
+   Do you want session setups at user level security with a invalid
+   password to be rejected or allowed in as guest? WinNT rejects them
+   but it can be a pain as it means "net view" needs to use a password
+
+   You have 3 choices in the setting of map_to_guest:
+
+   "NEVER_MAP_TO_GUEST" means session setups with an invalid password
+   are rejected. This is the default.
+
+   "MAP_TO_GUEST_ON_BAD_USER" means session setups with an invalid password
+   are rejected, unless the username does not exist, in which case it
+   is treated as a guest login
+
+   "MAP_TO_GUEST_ON_BAD_PASSWORD" means session setups with an invalid password
+   are treated as a guest login
+
+   Note that map_to_guest only has an effect in user or server
+   level security.
+*/
+
+#define NEVER_MAP_TO_GUEST 0
+#define MAP_TO_GUEST_ON_BAD_USER 1
+#define MAP_TO_GUEST_ON_BAD_PASSWORD 2
+
 #endif /* _SMB_H */
 
 /* _SMB_H */