From da3053048c3d224a20d6383ac6682d31059cd46c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sun, 11 Mar 2001 00:32:10 +0000
Subject: Merge of new 2.2 code into HEAD (Gerald I hate you :-) :-). Allows
 new SAMR RPC code to merge with new passdb code. Currently rpcclient doesn't
 compile. I'm working on it... Jeremy. (This used to be commit
 0be41d5158ea4e645e93e8cd30617c038416e549)

---
 source3/rpc_client/cli_samr.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'source3/rpc_client')

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index eb9032f7ce..a0e9ab6a00 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
 /* 
    Unix SMB/Netbios implementation.
    Version 1.9.
@@ -63,6 +62,9 @@ BOOL get_samr_query_usergroups(struct cli_state *cli,
 	return do_samr_close(cli, &pol_open_user);
 }
 
+#if 0
+/* DOES NOT COMPILE WITH THE NEW SAMR PARSE CODE. JRA. */
+
 /****************************************************************************
 do a SAMR query user info
 ****************************************************************************/
@@ -97,6 +99,7 @@ BOOL get_samr_query_userinfo(struct cli_state *cli,
 
 	return do_samr_close(cli, &pol_open_user);
 }
+#endif
 
 /****************************************************************************
 do a SAMR change user password command
@@ -156,6 +159,10 @@ BOOL do_samr_chgpasswd_user(struct cli_state *cli,
 	return True;
 }
 
+#if 0 
+
+/* CURRENTLY THIS DOESN'T COMPILE AND IS NOT USED ANYWHERE. JRA. */
+
 /****************************************************************************
 do a SAMR unknown 0x38 command
 ****************************************************************************/
@@ -208,6 +215,7 @@ BOOL do_samr_unknown_38(struct cli_state *cli, char *srv_name)
 
 	return True;
 }
+#endif
 
 /****************************************************************************
 do a SAMR unknown 0x8 command
@@ -266,6 +274,10 @@ BOOL do_samr_query_dom_info(struct cli_state *cli,
 	return True;
 }
 
+#if 0
+
+/* CURRENTLY DOESN'T COMPILE WITH THE NEW SAMR PARSE CODE. JRA */
+
 /****************************************************************************
 do a SAMR enumerate users
 ****************************************************************************/
@@ -356,6 +368,7 @@ BOOL do_samr_enum_dom_users(struct cli_state *cli,
 
 	return True;
 }
+#endif
 
 /****************************************************************************
 do a SAMR Connect
@@ -541,6 +554,10 @@ BOOL do_samr_open_domain(struct cli_state *cli,
 	return True;
 }
 
+#if 0
+
+/* CURRENTLY DOES NOT COMPILE AND IS NOT USED ANYWHERE. JRA. */
+
 /****************************************************************************
 do a SAMR Query Unknown 12
 ****************************************************************************/
@@ -621,6 +638,7 @@ BOOL do_samr_query_unknown_12(struct cli_state *cli,
 
 	return True;
 }
+#endif
 
 /****************************************************************************
 do a SAMR Query User Groups
@@ -684,6 +702,10 @@ BOOL do_samr_query_usergroups(struct cli_state *cli,
 	return True;
 }
 
+#if 0
+
+/* CURRENTLY DOES NOT COMPILE WITH THE NEW SAMR PARSE CODE. JRA */
+
 /****************************************************************************
 do a SAMR Query User Info
 ****************************************************************************/
@@ -756,6 +778,8 @@ BOOL do_samr_query_userinfo(struct cli_state *cli,
 	return True;
 }
 
+#endif
+
 /****************************************************************************
 do a SAMR Close
 ****************************************************************************/
@@ -820,5 +844,3 @@ BOOL do_samr_close(struct cli_state *cli, POLICY_HND *hnd)
 
 	return True;
 }
-
-#undef OLD_NTDOMAIN
-- 
cgit