Remove old js versions of newuser and provision.

Andrew Bartlett

diff --git a/source/setup/newuser b/source/setup/newuser
index 7c80e9e8de0c97cc377e9185967d85bb2b39c927..03ae4e5ffb69176ea5ac8e3df65643579241c94a 100755 (executable)
--- a/source/setup/newuser
+++ b/source/setup/newuser
@@ -1,80 +1,61 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-       add a new user to a Samba4 server
-       Copyright Andrew Tridgell 2005
-       Released under the GNU GPL v2 or later
-*/
-
-options = GetOptions(ARGV,
-               "POPT_AUTOHELP",
-               'username=s',
-               'unixname=s',
-               'password=s',
-               "POPT_COMMON_SAMBA",
-               "POPT_COMMON_VERSION",
-               "POPT_COMMON_CREDENTIALS",
-               'quiet');
-
-if (options == undefined) {
-   println("Failed to parse options");
-   return -1;
-}
-
-libinclude("base.js");
-libinclude("provision.js");
-
-/*
-  print a message if quiet is not set
-*/
-function message() 
-{
-       if (options["quiet"] == undefined) {
-               print(vsprintf(arguments));
-       }
-}
-
-/*
- show some help
-*/
-function ShowHelp()
-{
-       print("
-Samba4 newuser
-
-newuser [options]
-  --username  USERNAME     choose new username
-  --unixname  USERNAME     choose unix name of new user
-  --password  PASSWORD     set password
-
-You must provide at least a username
-");
-       exit(1);
-}
-
-if (options['username'] == undefined) {
-       ShowHelp();
-}
-
-if (options['password'] == undefined) {
-       random_init(local);
-       options.password = randpass(12);
-       printf("chose random password %s\n", options.password);
-}
-if (options['unixname'] == undefined) {
-       options.unixname = options.username;
-}
-
-var nss = nss_init();
-if (nss.getpwnam(options.unixname) == undefined) {
-       printf("ERROR: Unix user '%s' does not exist\n", options.unixname);
-       exit(1);
-}
-
-var creds = options.get_credentials();
-var system_session = system_session();
-
-
-newuser(options.username, options.unixname, options.password, message, system_session, creds);
-
-return 0;
+#!/usr/bin/python
+#
+#      add a new user to a Samba4 server
+#      Copyright Andrew Tridgell 2005
+#      Copyright Jelmer Vernooij 2008
+#      Released under the GNU GPL v2 or later
+#
+
+import samba.getopt as options
+import optparse
+import pwd
+import sys
+
+from auth import system_session
+from samba.samdb import SamDB
+
+parser = optparse.OptionParser("newuser [options] <username> [<password>]")
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option_group(options.VersionOptions(parser))
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+parser.add_option("--quiet", help="Be quiet", action="store_true")
+parser.add_option("--unixname", help="Unix Username", type=str)
+
+opts, args = parser.parse_args()
+
+#
+#  print a message if quiet is not set
+#
+def message(text):
+       if not opts.quiet:
+               print text
+
+if len(args) == 0:
+       parser.print_usage()
+       sys.exit(1)
+
+username = args[0]
+if len(args) > 1:
+       password = args[1]
+else:
+       random_init(local)
+       options.password = randpass(12)
+       print "chose random password %s\n" % password
+
+if opts.unixname is None:
+       opts.unixname = username
+
+try:
+       pwd.getpwnam(opts.unixname)
+except KeyError:
+       print "ERROR: Unix user '%s' does not exist" % opts.unixname
+       sys.exit(1)
+
+creds = credopts.get_credentials()
+
+lp = sambaopts.get_loadparm()
+samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), 
+              credentials=creds, lp=lp)
+samdb.newuser(username, opts.unixname, password)

diff --git a/source/setup/newuser.py b/source/setup/newuser.py
deleted file mode 100755 (executable)
index 03ae4e5..0000000
--- a/source/setup/newuser.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python
-#
-#      add a new user to a Samba4 server
-#      Copyright Andrew Tridgell 2005
-#      Copyright Jelmer Vernooij 2008
-#      Released under the GNU GPL v2 or later
-#
-
-import samba.getopt as options
-import optparse
-import pwd
-import sys
-
-from auth import system_session
-from samba.samdb import SamDB
-
-parser = optparse.OptionParser("newuser [options] <username> [<password>]")
-sambaopts = options.SambaOptions(parser)
-parser.add_option_group(sambaopts)
-parser.add_option_group(options.VersionOptions(parser))
-credopts = options.CredentialsOptions(parser)
-parser.add_option_group(credopts)
-parser.add_option("--quiet", help="Be quiet", action="store_true")
-parser.add_option("--unixname", help="Unix Username", type=str)
-
-opts, args = parser.parse_args()
-
-#
-#  print a message if quiet is not set
-#
-def message(text):
-       if not opts.quiet:
-               print text
-
-if len(args) == 0:
-       parser.print_usage()
-       sys.exit(1)
-
-username = args[0]
-if len(args) > 1:
-       password = args[1]
-else:
-       random_init(local)
-       options.password = randpass(12)
-       print "chose random password %s\n" % password
-
-if opts.unixname is None:
-       opts.unixname = username
-
-try:
-       pwd.getpwnam(opts.unixname)
-except KeyError:
-       print "ERROR: Unix user '%s' does not exist" % opts.unixname
-       sys.exit(1)
-
-creds = credopts.get_credentials()
-
-lp = sambaopts.get_loadparm()
-samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), 
-              credentials=creds, lp=lp)
-samdb.newuser(username, opts.unixname, password)

diff --git a/source/setup/provision.js b/source/setup/provision.js
deleted file mode 100755 (executable)
index 328754f..0000000
--- a/source/setup/provision.js
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-       provision a Samba4 server
-       Copyright Andrew Tridgell 2005
-       Released under the GNU GPL v2 or later
-*/
-
-options = GetOptions(ARGV,
-               "POPT_AUTOHELP",
-               "POPT_COMMON_SAMBA",
-               "POPT_COMMON_VERSION",
-               "POPT_COMMON_CREDENTIALS",
-               'realm=s',
-               'domain=s',
-               'domain-guid=s',
-               'domain-sid=s',
-               'policy-guid=s',
-               'host-name=s',
-               'host-ip=s',
-               'host-guid=s',
-               'invocationid=s',
-               'adminpass=s',
-               'krbtgtpass=s',
-               'machinepass=s',
-               'dnspass=s',
-               'root=s',
-               'nobody=s',
-               'nogroup=s',
-               'wheel=s',
-               'users=s',
-               'quiet',
-               'blank',
-               'server-role=s',
-               'partitions-only',
-               'ldap-base',
-               'ldap-backend=s',
-                'ldap-backend-type=s',
-                'aci=s');
-
-if (options == undefined) {
-   println("Failed to parse options");
-   return -1;
-}
-
-libinclude("base.js");
-libinclude("provision.js");
-
-/*
-  print a message if quiet is not set
-*/
-function message()
-{
-       if (options["quiet"] == undefined) {
-               print(vsprintf(arguments));
-       }
-}
-
-/*
- show some help
-*/
-function ShowHelp()
-{
-       print("
-Samba4 provisioning
-
-provision [options]
- --realm       REALM           set realm
- --domain      DOMAIN          set domain
- --domain-guid GUID            set domainguid (otherwise random)
- --domain-sid  SID             set domainsid (otherwise random)
- --host-name   HOSTNAME        set hostname
- --host-ip     IPADDRESS       set ipaddress
- --host-guid   GUID            set hostguid (otherwise random)
- --policy-guid  GUID            set group policy guid (otherwise random)
- --invocationid        GUID            set invocationid (otherwise random)
- --adminpass   PASSWORD        choose admin password (otherwise random)
- --krbtgtpass  PASSWORD        choose krbtgt password (otherwise random)
- --machinepass PASSWORD        choose machine password (otherwise random)
- --root         USERNAME       choose 'root' unix username
- --nobody      USERNAME        choose 'nobody' user
- --nogroup     GROUPNAME       choose 'nogroup' group
- --wheel       GROUPNAME       choose 'wheel' privileged group
- --users       GROUPNAME       choose 'users' group
- --quiet                       Be quiet
- --blank                       do not add users or groups, just the structure
- --server-role  ROLE            Set server role to provision for (default standalone)
- --partitions-only              Configure Samba's partitions, but do not modify them (ie, join a BDC)
- --ldap-base                   output only an LDIF file, suitable for creating an LDAP baseDN
- --ldap-backend LDAPSERVER      LDAP server to use for this provision
- --ldap-backend-type  TYPE      OpenLDAP or Fedora DS
- --aci          ACI             An arbitary LDIF fragment, particularly useful to loading a backend ACI value into a target LDAP server
-You must provide at least a realm and domain
-
-");
-       exit(1);
-}
-
-if (options['host-name'] == undefined) {
-       options['host-name'] = hostname();
-}
-
-/*
-   main program
-*/
-if (options["realm"] == undefined ||
-    options["domain"] == undefined ||
-    options["host-name"] == undefined) {
-       ShowHelp();
-}
-
-/* cope with an initially blank smb.conf */
-var lp = loadparm_init();
-lp.set("realm", options.realm);
-lp.set("workgroup", options.domain);
-lp.set("server role", options["server-role"]);
-lp.reload();
-
-var subobj = provision_guess();
-for (r in options) {
-       var key = strupper(join("", split("-", r)));
-       subobj[key] = options[r];
-}
-
-var blank = (options["blank"] != undefined);
-var ldapbackend = (options["ldap-backend"] != undefined);
-var ldapbackendtype = options["ldap-backend-type"];
-var partitions_only = (options["partitions-only"] != undefined);
-var paths = provision_default_paths(subobj);
-if (options["aci"] != undefined) {
-       message("set ACI: %s\n", subobj["ACI"]);
-}
-
-message("set DOMAIN SID: %s\n", subobj["DOMAINSID"]);
-
-provision_fix_subobj(subobj, paths);
-
-if (ldapbackend) {
-       if (options["ldap-backend"] == "ldapi") {
-               subobj.LDAPBACKEND = subobj.LDAPI_URI;
-       }
-       if (ldapbackendtype == undefined) {
-              
-       } else if (ldapbackendtype == "openldap") {
-               subobj.LDAPMODULE = "normalise,entryuuid";
-               subobj.TDB_MODULES_LIST = "";
-       } else if (ldapbackendtype == "fedora-ds") {
-               subobj.LDAPMODULE = "nsuniqueid";
-       }
-       subobj.BACKEND_MOD = subobj.LDAPMODULE + ",paged_searches";
-       subobj.DOMAINDN_LDB = subobj.LDAPBACKEND;
-       subobj.CONFIGDN_LDB = subobj.LDAPBACKEND;
-       subobj.SCHEMADN_LDB = subobj.LDAPBACKEND;
-       message("LDAP module: %s on backend: %s\n", subobj.LDAPMODULE, subobj.LDAPBACKEND);
-}
-
-if (!provision_validate(subobj, message)) {
-       return -1;
-}
-
-var system_session = system_session();
-var creds = options.get_credentials();
-message("Provisioning for %s in realm %s\n", subobj.DOMAIN, subobj.REALM);
-message("Using administrator password: %s\n", subobj.ADMINPASS);
-if (partitions_only) {
-       provision_become_dc(subobj, message, false, paths, system_session);
-} else {
-       provision(subobj, message, blank, paths, system_session, creds, ldapbackend);
-       provision_dns(subobj, message, paths, system_session, creds);
-       message("To reproduce this provision, run with:\n");
-/*     There has to be a better way than this... */
-       message("--realm='%s' --domain='%s' \\\n", subobj.REALM_CONF, subobj.DOMAIN_CONF);
-       if (subobj.DOMAINGUID != undefined) {
-                message("--domain-guid='%s' \\\n", subobj.DOMAINGUID);
-       }
-       if (subobj.HOSTGUID != undefined) {
-                message("--host-guid='%s' \\\n", subobj.HOSTGUID);
-       }
-       message("--policy-guid='%s' --host-name='%s' --host-ip='%s' \\\n", subobj.POLICYGUID, subobj.HOSTNAME, subobj.HOSTIP);
-       if (subobj.INVOCATIONID != undefined) {
-               message("--invocationid='%s' \\\n", subobj.INVOCATIONID);
-       }
-       message("--adminpass='%s' --krbtgtpass='%s' \\\n", subobj.ADMINPASS, subobj.KRBTGTPASS);
-       message("--machinepass='%s' --dnspass='%s' \\\n", subobj.MACHINEPASS, subobj.DNSPASS);
-       message("--root='%s' --nobody='%s' --nogroup='%s' \\\n", subobj.ROOT, subobj.NOBODY, subobj.NOGROUP);
-       message("--wheel='%s' --users='%s' --server-role='%s' \\\n", subobj.WHEEL, subobj.USERS, subobj.SERVERROLE);
-       if (ldapbackend) {
-               message("--ldap-backend='%s' \\\n", subobj.LDAPBACKEND);
-       }
-       if (ldapbackendtype != undefined) {
-               message("--ldap-backend-type='%s' \\\n", + ldapbackendtype);
-       }
-       message("--aci='" + subobj.ACI + "' \\\n")
-}
-
-
-message("All OK\n");
-return 0;