A small raft of changes, I will sync up with 1.9.18 also.

chgpasswd.c: Fixed typo in debug message.
includes.h: Fix include for aix.
kanji.c: Added cap_to_sj as inverse of sj_to_cap.
loadparm.c:
local.h:
password.c: Added code for "networkstation user login" parameter.
- patch from Rob Nielsen <ran@adc.com>.
printing.c: Added further aix printing fixes.
reply.c: Changed access time fetch to a function.
trans2.c: Changed access time fetch to a function.
time.c: Changed access time fetch to a function.
server.c: Made NT redirector workaround final.
util.c: Added debug for write_socket failing.
Jeremy.
(This used to be commit a031404623c22d62f8de035be2239f609af08112)

3 files changed, 7 insertions, 12 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 218ce19955..f9c29fd41d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -552,9 +552,12 @@ char *mktemp(char *); /* No standard include */
 #include <sys/vfs.h>
 #include <sys/id.h>
 #include <sys/priv.h>
+/* According to AIX 4.1 man pages, inet_ntoa needs the following headers */
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <locale.h>
-#include <arpa/inet.h>    /* needed for inet_ntoa proto */
 #define SYSV
 #define USE_WAITPID
 #define USE_SIGBLOCK
diff --git a/source3/include/local.h b/source3/include/local.h
index 0e2a927d2e..b2a8f5ec57 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -17,16 +17,6 @@
    refer to the special "printers" service */
 #define PRINTERS_NAME "printers"
 
-/* this affects server level security. With this set (recommended)
-   samba will do a full NetWkstaUserLogon to confirm that the client
-   really should have login rights. This can cause problems with
-   machines in trust relationships in which case you can disable it
-   here, but be warned, we have heard that some NT machines will then
-   allow anyone in with any password! Make sure you test it. */
-#ifndef USE_NETWKSTAUSERLOGON
-#define USE_NETWKSTAUSERLOGON 1
-#endif
-
 /* define what facility to use for syslog */
 #ifndef SYSLOG_FACILITY
 #define SYSLOG_FACILITY LOG_DAEMON
@@ -37,7 +27,7 @@
    MAX_CONNECTIONS services, but any number of machines may connect at
    one time. */
 #define MAX_CONNECTIONS 127
-#define MAX_OPEN_FILES 100
+#define MAX_OPEN_FILES 10
 
 /* Default size of shared memory used for share mode locking */
 #ifndef SHMEM_SIZE
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fd31db7e62..7f6321c869 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -279,6 +279,7 @@ BOOL lp_unix_realname(void);
 BOOL lp_nis_home_map(void);
 BOOL lp_time_server(void);
 BOOL lp_bind_interfaces_only(void);
+BOOL lp_net_wksta_user_logon(void);
 int lp_os_level(void);
 int lp_max_ttl(void);
 int lp_max_wins_ttl(void);
@@ -1340,6 +1341,7 @@ time_t make_unix_date2(void *date_ptr);
 time_t make_unix_date3(void *date_ptr);
 char *timestring(void );
 time_t get_create_time(struct stat *st);
+time_t get_access_time(struct stat *st);
 
 /*The following definitions come from  trans2.c  */