Add "net dom" command suite to "net".

Guenther
(This used to be commit a41f9aef843378b1f85f9b3d672d00f3399fa342)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b26766958e214e82317c43d2e81aa19b90a679f2..4eea8f18150609ed701bf1291aa51f8d3c4810b6 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -717,7 +717,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_domain.o utils/net_help.o \
           utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
           utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
           $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
-          utils/net_conf.o auth/token_util.o $(NETAPI_OBJ)
+          utils/net_conf.o auth/token_util.o utils/net_dom.o
 
 NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
          $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
@@ -727,7 +727,7 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
          $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
          $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
          $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
-         $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ)
+         $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(NETAPI_OBJ)
 
 CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
          $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 8015358f7de361d781f8a8ed8097e40f87324df4..ee671f6b58379f2a6e61ed1f8e3897b2ba4b0279 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -940,6 +940,7 @@ static struct functable net_func[] = {
        {"TIME", net_time},
        {"LOOKUP", net_lookup},
        {"JOIN", net_join},
+       {"DOM", net_dom},
        {"CACHE", net_cache},
        {"GETLOCALSID", net_getlocalsid},
        {"SETLOCALSID", net_setlocalsid},

diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index 9d86386ba6fdd8a3a3a388661b6430e2dd4c9a0c..2cb601f9172cc00fceeb06603e24a8a9f7ad7519 100644 (file)
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -266,6 +266,7 @@ int net_help(int argc, const char **argv)
                {"GROUP", net_help_group},
                {"GROUPMAP", net_help_groupmap},
                {"JOIN", net_help_join},
+               {"DOM", net_help_dom},
                {"VALIDATE", net_rap_validate_usage},
                {"GROUPMEMBER", net_rap_groupmember_usage},
                {"ADMIN", net_rap_admin_usage},