Merge from HEAD - save the type of channel used to contact the DC.

[sfrench/samba-autobuild/.git] / source / utils / net.c

diff --git a/source/utils/net.c b/source/utils/net.c
index 7588771fbc3f16aefec2950a0e14447f9bb96006..b404bac59522cabe098dfde756063ca9feb44952 100644 (file)
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -68,9 +68,8 @@ int opt_force = 0;
 int opt_port = 0;
 int opt_maxusers = -1;
 const char *opt_comment = "";
-char *opt_container = "cn=Users";
+const char *opt_container = "cn=Users";
 int opt_flags = -1;
-int opt_jobid = 0;
 int opt_timeout = 0;
 const char *opt_target_workgroup = NULL;
 static int opt_machine_pass = 0;
@@ -78,7 +77,26 @@ static int opt_machine_pass = 0;
 BOOL opt_have_ip = False;
 struct in_addr opt_dest_ip;
 
-extern BOOL AllowDebugChange;
+uint32 get_sec_channel_type(const char *param) 
+{
+       if (!(param && *param)) {
+               return get_default_sec_channel();
+       } else {
+               if (strcasecmp(param, "PDC")==0) {
+                       return SEC_CHAN_BDC;
+               } else if (strcasecmp(param, "BDC")==0) {
+                       return SEC_CHAN_BDC;
+               } else if (strcasecmp(param, "MEMBER")==0) {
+                       return SEC_CHAN_WKSTA;
+#if 0                  
+               } else if (strcasecmp(param, "DOMAIN")==0) {
+                       return SEC_CHAN_DOMAIN;
+#endif
+               } else {
+                       return get_default_sec_channel();
+               }
+       }
+}
 
 /*
   run a function from a function table. If not found then
@@ -308,6 +326,14 @@ static int net_join(int argc, const char **argv)
        return net_rpc_join(argc, argv);
 }
 
+static int net_changetrustpw(int argc, const char **argv)
+{
+       if (net_ads_check() == 0)
+               return net_ads_changetrustpw(argc, argv);
+
+       return net_rpc_changetrustpw(argc, argv);
+}
+
 static int net_share(int argc, const char **argv)
 {
        if (net_rpc_check(0))
@@ -322,6 +348,26 @@ static int net_file(int argc, const char **argv)
        return net_rap_file(argc, argv);
 }
 
+/***********************************************************
+ migrated functionality from smbgroupedit
+ **********************************************************/
+static int net_groupmap(int argc, const char **argv)
+{
+       if ( 0 == argc )
+               return net_help_groupmap( argc, argv );
+
+       if ( !StrCaseCmp( argv[0], "add" ) )
+               return net_groupmap_add(argc-1, argv+1);
+       else if ( !StrCaseCmp( argv[0], "modify" ) )
+               return net_groupmap_modify(argc-1, argv+1);
+       else if ( !StrCaseCmp( argv[0], "delete" ) )
+               return net_groupmap_delete(argc-1, argv+1);
+       else if ( !StrCaseCmp( argv[0], "list" ) )
+               return net_groupmap_list(argc-1, argv+1);
+       
+       return net_help_groupmap( argc, argv );
+}
+
 /*
  Retrieve our local SID or the SID for the specified name
  */
@@ -454,7 +500,7 @@ static int net_maxrid(int argc, const char **argv)
        uint32 rid;
 
        if (argc != 0) {
-               DEBUG(0, ("usage: net initrid\n"));
+               DEBUG(0, ("usage: net maxrid\n"));
                return 1;
        }
 
@@ -483,11 +529,13 @@ static struct functable net_func[] = {
        {"PRINTQ", net_rap_printq},
        {"USER", net_user},
        {"GROUP", net_group},
+       {"GROUPMAP", net_groupmap},
        {"VALIDATE", net_rap_validate},
        {"GROUPMEMBER", net_rap_groupmember},
        {"ADMIN", net_rap_admin},
        {"SERVICE", net_rap_service},   
        {"PASSWORD", net_rap_password},
+       {"CHANGETRUSTPW", net_changetrustpw},
        {"TIME", net_time},
        {"LOOKUP", net_lookup},
        {"JOIN", net_join},
@@ -513,31 +561,26 @@ static struct functable net_func[] = {
        int argc_new = 0;
        const char ** argv_new;
        poptContext pc;
-       static char *servicesf = dyn_CONFIGFILE;
-       static char *debuglevel = NULL;
 
        struct poptOption long_options[] = {
                {"help",        'h', POPT_ARG_NONE,   0, 'h'},
                {"workgroup",   'w', POPT_ARG_STRING, &opt_target_workgroup},
-               {"myworkgroup", 'W', POPT_ARG_STRING, &opt_workgroup},
                {"user",        'U', POPT_ARG_STRING, &opt_user_name, 'U'},
                {"ipaddress",   'I', POPT_ARG_STRING, 0,'I'},
                {"port",        'p', POPT_ARG_INT,    &opt_port},
                {"myname",      'n', POPT_ARG_STRING, &opt_requester_name},
-               {"conf",        's', POPT_ARG_STRING, &servicesf},
                {"server",      'S', POPT_ARG_STRING, &opt_host},
                {"container",   'c', POPT_ARG_STRING, &opt_container},
                {"comment",     'C', POPT_ARG_STRING, &opt_comment},
                {"maxusers",    'M', POPT_ARG_INT,    &opt_maxusers},
                {"flags",       'F', POPT_ARG_INT,    &opt_flags},
-               {"jobid",       'j', POPT_ARG_INT,    &opt_jobid},
                {"long",        'l', POPT_ARG_NONE,   &opt_long_list_entries},
                {"reboot",      'r', POPT_ARG_NONE,   &opt_reboot},
                {"force",       'f', POPT_ARG_NONE,   &opt_force},
                {"timeout",     't', POPT_ARG_INT,    &opt_timeout},
                {"machine-pass",'P', POPT_ARG_NONE,   &opt_machine_pass},
-               {"debuglevel",  'd', POPT_ARG_STRING, &debuglevel},
-               {NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
+               {"myworkgroup", 'W', POPT_ARG_STRING, &opt_workgroup},
+               POPT_COMMON_SAMBA
                { 0, 0, 0, 0}
        };
 
@@ -577,13 +620,8 @@ static struct functable net_func[] = {
                        exit(1);
                }
        }
-
-       if (debuglevel) {
-               debug_parse_levels(debuglevel);
-               AllowDebugChange = False;
-       }
-
-       lp_load(servicesf,True,False,False);       
+       
+       lp_load(dyn_CONFIGFILE,True,False,False);       
 
        argv_new = (const char **)poptGetArgs(pc);
 
@@ -606,11 +644,11 @@ static struct functable net_func[] = {
        }
 
        if (!opt_workgroup) {
-               opt_workgroup = lp_workgroup();
+               opt_workgroup = smb_xstrdup(lp_workgroup());
        }
        
        if (!opt_target_workgroup) {
-               opt_target_workgroup = strdup(lp_workgroup());
+               opt_target_workgroup = smb_xstrdup(lp_workgroup());
        }
        
        if (!init_names())
@@ -619,7 +657,7 @@ static struct functable net_func[] = {
        load_interfaces();
 
        if (opt_machine_pass) {
-               char *user;
+               char *user = NULL;
                /* it is very useful to be able to make ads queries as the
                   machine account for testing purposes and for domain leave */
 
@@ -628,14 +666,19 @@ static struct functable net_func[] = {
                        exit(1);
                }
 
+               opt_password = secrets_fetch_machine_password(opt_workgroup, NULL, NULL);
+
                asprintf(&user,"%s$", global_myname());
                opt_user_name = user;
-               opt_password = secrets_fetch_machine_password();
                if (!opt_password) {
                        d_printf("ERROR: Unable to fetch machine password\n");
                        exit(1);
                }
        }
+
+       if (!opt_password) {
+               opt_password = getenv("PASSWD");
+       }
         
        rc = net_run_function(argc_new-1, argv_new+1, net_func, net_help);