s3:smbcontrol: remove unused "samsync" and "samrepl" commands

metze

diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index 31c3537a654cbcd34f7042cef7a7a74ebaf482c0..f83376bbd49cfcd8394f2315de0a2cc44d9bd4c0 100644 (file)
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -222,18 +222,6 @@
        </listitem>
        </varlistentry>
 
-       <varlistentry>
-       <term>samsync</term>
-       <listitem><para>Order smbd to synchronise sam database from PDC (being BDC). Can only be sent to <constant>smbd</constant>. </para>
-       <note><para>Not working at the moment</para></note>
-       </listitem>
-       </varlistentry>
-
-       <varlistentry>
-       <term>samrepl</term>
-       <listitem><para>Send sam replication message, with specified serial. Can only be sent to <constant>smbd</constant>. Should not be used manually.</para></listitem>
-       </varlistentry>
-
        <varlistentry>
        <term>dmalloc-mark</term>
        <listitem><para>Set a mark for dmalloc. Can be sent to both smbd and nmbd. Only available if samba is built with dmalloc support. </para></listitem>

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 747c35ceba44b6f3e54f512a68b570b1dbbb88f3..f0eafa08ee65da43ca30dce7d4debea187f507de 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -822,34 +822,6 @@ static bool do_brl_revalidate(struct messaging_context *msg_ctx,
        return send_message(msg_ctx, pid, MSG_SMB_BRL_VALIDATE, NULL, 0);
 }
 
-/* Force a SAM synchronisation */
-
-static bool do_samsync(struct messaging_context *msg_ctx,
-                      const struct server_id pid,
-                      const int argc, const char **argv)
-{
-       if (argc != 1) {
-               fprintf(stderr, "Usage: smbcontrol <dest> samsync\n");
-               return False;
-       }
-
-       return send_message(msg_ctx, pid, MSG_SMB_SAM_SYNC, NULL, 0);
-}
-
-/* Force a SAM replication */
-
-static bool do_samrepl(struct messaging_context *msg_ctx,
-                      const struct server_id pid,
-                      const int argc, const char **argv)
-{
-       if (argc != 1) {
-               fprintf(stderr, "Usage: smbcontrol <dest> samrepl\n");
-               return False;
-       }
-
-       return send_message(msg_ctx, pid, MSG_SMB_SAM_REPL, NULL, 0);
-}
-
 /* Display talloc pool usage */
 
 static bool do_poolusage(struct messaging_context *msg_ctx,
@@ -1268,8 +1240,6 @@ static const struct {
        { "ip-dropped", do_ip_dropped, "Tell winbind that an IP got dropped" },
        { "lockretry", do_lockretry, "Force a blocking lock retry" },
        { "brl-revalidate", do_brl_revalidate, "Revalidate all brl entries" },
-        { "samsync", do_samsync, "Initiate SAM synchronisation" },
-        { "samrepl", do_samrepl, "Initiate SAM replication" },
        { "pool-usage", do_poolusage, "Display talloc memory usage" },
        { "dmalloc-mark", do_dmalloc_mark, "" },
        { "dmalloc-log-changed", do_dmalloc_changed, "" },