fixed HAVE_SETUID autoconf problems.

const issues in credentials.c / cli_login.

make proto

7 files changed, 43 insertions, 15 deletions

diff --git a/source/acconfig.h b/source/acconfig.h
index e4159f65223..55fd87425e5 100644
--- a/source/acconfig.h
+++ b/source/acconfig.h
@@ -94,7 +94,13 @@
 #undef WITH_LIBNMB
 #undef WITH_LIBSAMBA
 #undef WITH_LIBSMB
+#undef WITH_LIBSURS
 #undef WITH_LIBSMBPW
 #undef WITH_LIBUBIQX
 
+#undef USE_SETEUID
+#undef USE_SETRESUID
+#undef USE_SETREUID
+#undef USE_SETUIDX
+
 #undef WITH_NT5LDAP
diff --git a/source/include/config.h.in b/source/include/config.h.in
index f13e0f165ac..6c417f6f193 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -18,6 +18,9 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
+/* Define if you have a working `mmap' system call.  */
+#undef HAVE_MMAP
+
 /* Define if your struct stat has st_rdev.  */
 #undef HAVE_ST_RDEV
 
@@ -112,6 +115,7 @@
 #undef WITH_PROFILE
 #undef WITH_SSL
 #undef WITH_LDAP
+#undef WITH_TDBSURS
 #undef WITH_NISPLUS
 #undef WITH_NISPLUS_HOME
 #undef WITH_AUTOMOUNT
@@ -150,16 +154,17 @@
 #undef WITH_LIBNMB
 #undef WITH_LIBSAMBA
 #undef WITH_LIBSMB
+#undef WITH_LIBSURS
 #undef WITH_LIBSMBPW
 #undef WITH_LIBUBIQX
 
-#undef WITH_NT5LDAP
-
 #undef USE_SETEUID
 #undef USE_SETRESUID
 #undef USE_SETREUID
 #undef USE_SETUIDX
 
+#undef WITH_NT5LDAP
+
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
diff --git a/source/include/lib_smb_proto.h b/source/include/lib_smb_proto.h
index f8a47b08c51..be8ef4681da 100644
--- a/source/include/lib_smb_proto.h
+++ b/source/include/lib_smb_proto.h
@@ -210,8 +210,8 @@ BOOL get_any_dc_name(const char *domain, char *srv_name);
 /*The following definitions come from  libsmb/credentials.c  */
 
 char *credstr(const uchar *cred);
-void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
-		      uchar session_key[8]);
+void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
+		      const uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
 		 DOM_CHAL *cred);
 int cred_assert(const DOM_CHAL *cred, uchar session_key[8],
diff --git a/source/include/proto.h b/source/include/proto.h
index 910617a5369..5ceba9b1385 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -399,6 +399,7 @@ int smbrun(char *cmd,char *outfile,BOOL shared);
 
 void become_root(BOOL save_dir);
 void unbecome_root(BOOL restore_dir);
+const vuser_key *get_sec_ctx(void);
 
 /*The following definitions come from  lib/surs.c  */
 
@@ -414,8 +415,16 @@ BOOL surs_algdomonly_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid,
 
 /*The following definitions come from  lib/sursalgnt5ldap.c  */
 
-BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID *sid, uint32 type, uint32 *id);
-BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type, DOM_SID *sid,
+BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID * sid, uint32 type,
+				    uint32 * id, BOOL create);
+BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type,
+				    DOM_SID * sid, BOOL create);
+
+/*The following definitions come from  lib/surstdb.c  */
+
+BOOL surs_tdb_sam_sid_to_unixid(DOM_SID * sid, uint32 type, uint32 * id,
+				BOOL create);
+BOOL surs_tdb_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID * sid,
 				BOOL create);
 
 /*The following definitions come from  lib/system.c  */
@@ -954,8 +963,8 @@ BOOL get_any_dc_name(const char *domain, char *srv_name);
 /*The following definitions come from  libsmb/credentials.c  */
 
 char *credstr(const uchar *cred);
-void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
-		      uchar session_key[8]);
+void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
+		      const uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
 		 DOM_CHAL *cred);
 int cred_assert(const DOM_CHAL *cred, uchar session_key[8],
diff --git a/source/include/winbindd_proto.h b/source/include/winbindd_proto.h
index 31134cd3623..833c10c1e71 100644
--- a/source/include/winbindd_proto.h
+++ b/source/include/winbindd_proto.h
@@ -222,8 +222,16 @@ BOOL surs_algdomonly_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid,
 
 /*The following definitions come from  lib/sursalgnt5ldap.c  */
 
-BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID *sid, uint32 type, uint32 *id);
-BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type, DOM_SID *sid,
+BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID * sid, uint32 type,
+				    uint32 * id, BOOL create);
+BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type,
+				    DOM_SID * sid, BOOL create);
+
+/*The following definitions come from  lib/surstdb.c  */
+
+BOOL surs_tdb_sam_sid_to_unixid(DOM_SID * sid, uint32 type, uint32 * id,
+				BOOL create);
+BOOL surs_tdb_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID * sid,
 				BOOL create);
 
 /*The following definitions come from  lib/system.c  */
@@ -744,8 +752,8 @@ BOOL get_any_dc_name(const char *domain, char *srv_name);
 /*The following definitions come from  libsmb/credentials.c  */
 
 char *credstr(const uchar *cred);
-void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
-		      uchar session_key[8]);
+void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
+		      const uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
 		 DOM_CHAL *cred);
 int cred_assert(const DOM_CHAL *cred, uchar session_key[8],
diff --git a/source/libsmb/credentials.c b/source/libsmb/credentials.c
index 7a4d921810b..7d6c7c33b81 100644
--- a/source/libsmb/credentials.c
+++ b/source/libsmb/credentials.c
@@ -46,8 +46,8 @@ Input: 8 byte challenge block
 Output:
       8 byte session key
 ****************************************************************************/
-void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
-		      uchar session_key[8])
+void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass,
+		      const uchar session_key[8])
 {
 	uint32 sum[2];
 	unsigned char sum2[8];
diff --git a/source/rpc_client/cli_login.c b/source/rpc_client/cli_login.c
index 2fcfa96d53c..ae6aff300e3 100644
--- a/source/rpc_client/cli_login.c
+++ b/source/rpc_client/cli_login.c
@@ -59,7 +59,7 @@ uint32 cli_nt_setup_creds(const char *srv_name,
 	/**************** Long-term Session key **************/
 
 	/* calculate the session key */
-	cred_session_key(&clnt_chal, &srv_chal, (char *)trust_pwd, sess_key);
+	cred_session_key(&clnt_chal, &srv_chal, trust_pwd, sess_key);
 	bzero(sess_key + 8, 8);
 
 	/******************* Authenticate 2 ********************/