adding CAP_EXTENDED_SECURITY support in a hurry last week. forgot to

deal with linking issues in other binaries
(This used to be commit 57f95a01988fb4035b2e4448f4fd3ef0d652c106)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6c83d735258426a1b5de403a4adf5db606a66618..ce066568c7c7cb599aad539dfe95e58b8f469e5f 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -111,8 +111,7 @@ LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
          lib/bitmap.o lib/crc32.o lib/util_sid.o lib/snprintf.o \
                lib/util_str.o lib/util_unistr.o \
                lib/util_file.o mem_man/mem_man.o \
-               lib/util_sock.o lib/unix_sec_ctxt.o
-
+               lib/util_sock.o lib/unix_sec_ctxt.o \
 
 UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \
             ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o
@@ -138,14 +137,19 @@ RPC_SERVER_OBJ = \
                rpc_server/srv_wkssvc.o \
                rpc_server/srv_spoolss.o
 
-RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_misc.o \
-                rpc_parse/parse_net.o rpc_parse/parse_prs.o \
-                rpc_parse/parse_reg.o rpc_parse/parse_rpc.o \
+RPC_PARSE_OBJ1 = rpc_parse/parse_lsa.o \
+                rpc_parse/parse_net.o \
+                rpc_parse/parse_reg.o \
                 rpc_parse/parse_samr.o rpc_parse/parse_srv.o \
                 rpc_parse/parse_wks.o rpc_parse/parse_sec.o \
                 rpc_parse/parse_svc.o rpc_parse/parse_at.o \
                rpc_parse/parse_spoolss.o rpc_parse/parse_eventlog.o
 
+RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_prs.o \
+               rpc_parse/parse_misc.o 
+
+RPC_PARSE_OBJ = $(RPC_PARSE_OBJ1) $(RPC_PARSE_OBJ2)
+
 RPC_CLIENT_OBJ = \
                rpc_client/cli_login.o    \
                rpc_client/cli_netlogon.o \
@@ -211,7 +215,7 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
             nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
 
 NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
-            $(LIB_OBJ) 
+            $(LIB_OBJ) $(RPC_PARSE_OBJ2)
 
 SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
            web/swat.o $(LIBSMB_OBJ) $(LOCKING_OBJ) \
@@ -221,7 +225,7 @@ SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
 SMBRUN_OBJ = utils/smbrun.o
 
 SMBSH_OBJ = smbwrapper/smbsh.o smbwrapper/shared.o \
-            $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
+            $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
 
 MAKE_SMBCODEPAGE_OBJ = utils/make_smbcodepage.o $(PARAM_OBJ) \
                        $(UBIQX_OBJ) $(LIB_OBJ)
@@ -263,7 +267,7 @@ SMBWRAPPER_OBJ = smbwrapper/smbw.o smbwrapper/wrapped.o \
                 $(UBIQX_OBJ) $(LIB_OBJ)
 
 CLIENT_OBJ = client/client.o client/clitar.o \
-             $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
+             $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
 
 MOUNT_OBJ = client/smbmount.o client/clientutil.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
@@ -275,7 +279,7 @@ UMOUNT_OBJ = client/smbumount.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
 
 NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(UBIQX_OBJ) \
-                $(LIBSMB_OBJ) $(LIB_OBJ)
+                $(LIBSMB_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
 
 DEBUG2HTML_OBJ = utils/debug2html.o $(PARAM_OBJ) $(LIB_OBJ)
 

diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c
index b833cbd37706150f6f4ee59a38ffca995b18e12e..b4f2cb1601fc1b70f46d87e7fac01545158d6c72 100644 (file)
--- a/source3/libsmb/smbencrypt.c
+++ b/source3/libsmb/smbencrypt.c
@@ -400,3 +400,32 @@ BOOL nt_decrypt_string2(STRING2 *out, const STRING2 *in, char nt_hash[16])
 
        return True;
 }
+
+/*******************************************************************
+ creates a DCE/RPC bind authentication response
+
+ - initialises the parse structure.
+ - dynamically allocates the header data structure
+ - caller is expected to free the header data structure once used.
+
+ ********************************************************************/
+void create_ntlmssp_resp(struct pwd_info *pwd,
+                               char *domain, char *user_name, char *my_name,
+                               uint32 ntlmssp_cli_flgs,
+                                prs_struct *auth_resp)
+{
+       RPC_AUTH_NTLMSSP_RESP     ntlmssp_resp;
+       unsigned char lm_owf[24];
+       unsigned char nt_owf[128];
+       size_t nt_owf_len;
+
+       pwd_get_lm_nt_owf(pwd, lm_owf, nt_owf, &nt_owf_len);
+                       
+       make_rpc_auth_ntlmssp_resp(&ntlmssp_resp,
+                                lm_owf, nt_owf, nt_owf_len,
+                                domain, user_name, my_name,
+                                ntlmssp_cli_flgs);
+
+       smb_io_rpc_auth_ntlmssp_resp("ntlmssp_resp", &ntlmssp_resp, auth_resp, 0);
+       mem_realloc_data(auth_resp->data, auth_resp->offset);
+}

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 0453bb3125eacf0b341b6e704685aac6261b91ba..6b50fa53adef2ba9b6e3cc51d400a1b242ebea32 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -473,35 +473,6 @@ static BOOL create_rpc_bind_req(prs_struct *rhdr,
        return True;
 }
 
-/*******************************************************************
- creates a DCE/RPC bind authentication response
-
- - initialises the parse structure.
- - dynamically allocates the header data structure
- - caller is expected to free the header data structure once used.
-
- ********************************************************************/
-void create_ntlmssp_resp(struct pwd_info *pwd,
-                               char *domain, char *user_name, char *my_name,
-                               uint32 ntlmssp_cli_flgs,
-                                prs_struct *auth_resp)
-{
-       RPC_AUTH_NTLMSSP_RESP     ntlmssp_resp;
-       unsigned char lm_owf[24];
-       unsigned char nt_owf[128];
-       size_t nt_owf_len;
-
-       pwd_get_lm_nt_owf(pwd, lm_owf, nt_owf, &nt_owf_len);
-                       
-       make_rpc_auth_ntlmssp_resp(&ntlmssp_resp,
-                                lm_owf, nt_owf, nt_owf_len,
-                                domain, user_name, my_name,
-                                ntlmssp_cli_flgs);
-
-       smb_io_rpc_auth_ntlmssp_resp("ntlmssp_resp", &ntlmssp_resp, auth_resp, 0);
-       mem_realloc_data(auth_resp->data, auth_resp->offset);
-}
-
 /*******************************************************************
  creates a DCE/RPC bind authentication response