r12592: Remove some useless dependencies

(This used to be commit ca8db1a0cd77682ac2c6dc4718f5d753a4fcc4db)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index b24aea836a36060cf25728ac196f5ecd3b1b26a8..d8fc9a8ddfed80f2a5de7a767a2d7930e64722b2 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -74,5 +74,6 @@ OBJ_FILES = \
                auth_sam_reply.o \
                ntlm_check.o \
                auth_simple.o
+REQUIRED_SUBSYSTEMS = LIB_SECURITY
 # End SUBSYSTEM AUTH
 #######################

diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index db36b01334ee8657f8ad9342d24555695177a649..f0e5ea3f211e2d4514d554bf303f0d748ff6a111 100644 (file)
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = credentials.o \
                credentials_ntlm.o \
                credentials_gensec.o 
 REQUIRED_SUBSYSTEMS = \
-               HEIMDAL GENSEC
+               HEIMDAL GENSEC LIBCLI_AUTH LIBLDB
 # End SUBSYSTEM CREDENTIALS
 #################################
 

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 54b082bda0c75f5e4acb2c38e818ae06e28c1d67..cfeab402a6f5bf6314235f9e6ad5c9cc8308edd2 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -10,7 +10,7 @@ PRIVATE_PROTO_HEADER = gensec_proto.h
 INIT_FUNCTION = gensec_init
 OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \
-               SCHANNELDB
+               SCHANNELDB CREDENTIALS
 # End SUBSYSTEM GENSEC
 #################################
 
@@ -51,7 +51,7 @@ SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_schannel_init
 OBJ_FILES = schannel.o \
                        schannel_sign.o
-REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB
+REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB NDR_SCHANNEL
 # End MODULE gensec_schannel
 ################################################
 

diff --git a/source4/client/config.mk b/source4/client/config.mk
index f263edf8d1b6eb2d509f5b3ebe21de8b53c55504..2cf5dbb80ad83f03bde8b703aed128b5c6451dc7 100644 (file)
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -8,10 +8,13 @@ OBJ_FILES = \
                client.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
+               LIBREADLINE \
                LIBBASIC \
                LIBSMB \
                RPC_NDR_SRVSVC \
-               LIBCLI_LSA
+               LIBCLI_LSA \
+               LIBPOPT \
+               POPT_SAMBA \
+               POPT_CREDENTIALS
 # End BINARY smbclient
 #################################

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index b691a45f2137ad2e955016ba4886b2bcc4eedc5c..d7188e43b59aa1d4ef89db67507e97d272a714b6 100644 (file)
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -6,13 +6,12 @@ include samdb/ldb_modules/config.mk
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
 PRIVATE_PROTO_HEADER = samdb/samdb.h
+REQUIRED_SUBSYSTEMS = DB_WRAP
 OBJ_FILES = \
                samdb/samdb.o \
                samdb/samdb_privilege.o \
                samdb/cracknames.o \
                common/flag_mapping.o
-REQUIRED_SUBSYSTEMS = \
-               DCERPC_COMMON
 #
 # End SUBSYSTEM SAMDB
 ################################################

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index b5479e89be5496598b3d9958214c1c3f73cb3117..6c9739f2450032b65e5a47057ca835a4f6769590 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -24,9 +24,8 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
-#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
 #include "rpc_server/drsuapi/dcesrv_drsuapi.h"
+#include "rpc_server/common/common.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/kerberos.h"

diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index 5ae5f8983276afadb9b4928dd450f234d787a2aa..dfd42a174eb3479374849156eea7230ddc598880 100644 (file)
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -22,7 +22,7 @@ REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR
 [BINARY::gregedit]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gregedit.o
-REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE REGISTRY GTKSMB
+REQUIRED_SUBSYSTEMS = CONFIG REGISTRY GTKSMB
 MANPAGE = man/gregedit.1
 # End BINARY gregedit
 ################################################
@@ -32,7 +32,7 @@ MANPAGE = man/gregedit.1
 [BINARY::gepdump]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gepdump.o
-REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
+REQUIRED_SUBSYSTEMS = CONFIG GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
 # End BINARY gepdump 
 ################################################
 
@@ -41,7 +41,7 @@ REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
 [BINARY::gwcrontab]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gwcrontab.o
-REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_ATSVC
+REQUIRED_SUBSYSTEMS = CONFIG GTKSMB RPC_NDR_ATSVC
 # End BINARY gwcrontab
 ################################################
 
@@ -50,6 +50,6 @@ REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_ATSVC
 [BINARY::gwsam]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gwsam.o tools/gwsam_user.o
-REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE RPC_NDR_SAMR GTKSMB
+REQUIRED_SUBSYSTEMS = CONFIG RPC_NDR_SAMR GTKSMB
 # End BINARY gwsam
 ################################################

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index a092f2c818d3ddb45600f5a07cc77d60276daceb..92b60bfd4028b437da4e2bd39a555c4afe2d9ec9 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -87,15 +87,18 @@ OBJ_FILES = version.o \
                select.o \
                mutex.o \
                idtree.o \
-               db_wrap.o \
-               gendb.o \
                module.o
 REQUIRED_SUBSYSTEMS = \
-               LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
+               CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
                SOCKET_WRAPPER CONFIG
 # End SUBSYSTEM LIBBASIC
 ##############################
 
+[SUBSYSTEM::DB_WRAP]
+OBJ_FILES = db_wrap.o \
+               gendb.o
+REQUIRED_SUBSYSTEMS = LIBLDB 
+
 [SUBSYSTEM::PIDFILE]
 OBJ_FILES = pidfile.o
 

diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 36f8ba7469329b77a22b4906dfbee6fc11bb1ebf..28e482d9b261bda5fb540f1964c29683ae83427c 100644 (file)
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,8 +1,10 @@
-##############################
-# Start SUBSYSTEM LIBCMDLINE_CREDENTIALS
 [SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
-OBJ_FILES = getsmbpass.o \
-               credentials.o
+OBJ_FILES = credentials.o
 REQUIRED_SUBSYSTEMS = CREDENTIALS
-# End SUBSYSTEM LIBCMDLINE_CREDENTIALS
-##############################
+
+[SUBSYSTEM::POPT_SAMBA]
+OBJ_FILES = popt_common.o
+
+[SUBSYSTEM::POPT_CREDENTIALS]
+OBJ_FILES = popt_credentials.o
+REQUIRED_SUBSYSTEMS = CREDENTIALS LIBCMDLINE_CREDENTIALS

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index b1f4563fb13062bb151e0f1c2c9f71e29bc7f453..b8c5b5b9d31bc4614197f0ae35681ff1ad5f1780 100644 (file)
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -37,7 +37,7 @@
  *             -i,--scope
  */
 
-enum {OPT_OPTION=1,OPT_LEAK_REPORT,OPT_LEAK_REPORT_FULL, OPT_DEBUG_STDERR, OPT_SIMPLE_BIND_DN};
+enum {OPT_OPTION=1,OPT_LEAK_REPORT,OPT_LEAK_REPORT_FULL,OPT_DEBUG_STDERR};
 
 struct cli_credentials *cmdline_credentials = NULL;
 
@@ -173,89 +173,3 @@ struct poptOption popt_common_version[] = {
        POPT_TABLEEND
 };
 
-/* Handle command line options:
- *             -U,--user
- *             -A,--authentication-file
- *             -k,--use-kerberos
- *             -N,--no-pass
- *             -S,--signing
- *      -P --machine-pass
- */
-
-
-static BOOL dont_ask;
-
-/*
-  disable asking for a password
-*/
-void popt_common_dont_ask(void)
-{
-       dont_ask = True;
-}
-
-static void popt_common_credentials_callback(poptContext con, 
-                                               enum poptCallbackReason reason,
-                                               const struct poptOption *opt,
-                                               const char *arg, const void *data)
-{
-       if (reason == POPT_CALLBACK_REASON_PRE) {
-               cmdline_credentials = cli_credentials_init(talloc_autofree_context());
-               return;
-       }
-       
-       if (reason == POPT_CALLBACK_REASON_POST) {
-               cli_credentials_guess(cmdline_credentials);
-
-               if (!dont_ask) {
-                       cli_credentials_set_cmdline_callbacks(cmdline_credentials);
-               }
-               return;
-       }
-
-       switch(opt->val) {
-       case 'U':
-               {
-                       char *lp;
-
-                       cli_credentials_parse_string(cmdline_credentials, arg, CRED_SPECIFIED);
-                       /* This breaks the abstraction, including the const above */
-                       if ((lp=strchr_m(arg,'%'))) {
-                               lp[0]='\0';
-                               lp++;
-                               memset(lp,0,strlen(lp));
-                       }
-               }
-               break;
-
-       case 'A':
-               cli_credentials_parse_file(cmdline_credentials, arg, CRED_SPECIFIED);
-               break;
-
-       case 'S':
-               lp_set_cmdline("client signing", arg);
-               break;
-
-       case 'P':
-               /* Later, after this is all over, get the machine account details from the secrets.ldb */
-               cli_credentials_set_machine_account_pending(cmdline_credentials);
-               
-               /* machine accounts only work with kerberos (fall though)*/
-               break;
-       case OPT_SIMPLE_BIND_DN:
-               cli_credentials_set_bind_dn(cmdline_credentials, arg);
-               break;
-       }
-}
-
-
-
-struct poptOption popt_common_credentials[] = {
-       { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, popt_common_credentials_callback },
-       { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN\\]USERNAME[%PASSWORD]" },
-       { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, True, "Don't ask for a password" },
-       { "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" },
-       { "signing", 'S', POPT_ARG_STRING, NULL, 'S', "Set the client signing state", "on|off|required" },
-       { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password (implies -k)" },
-       { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" },
-       POPT_TABLEEND
-};

diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
new file mode 100644 (file)
index 0000000..a974d80
--- /dev/null
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -0,0 +1,115 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Credentials popt routines
+
+   Copyright (C) Jelmer Vernooij 2002,2003,2005
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "version.h"
+#include "system/filesys.h"
+#include "system/passwd.h"
+#include "lib/cmdline/popt_common.h"
+
+/* Handle command line options:
+ *             -U,--user
+ *             -A,--authentication-file
+ *             -k,--use-kerberos
+ *             -N,--no-pass
+ *             -S,--signing
+ *      -P --machine-pass
+ */
+
+
+static BOOL dont_ask;
+
+enum opt { OPT_SIMPLE_BIND_DN };
+
+/*
+  disable asking for a password
+*/
+void popt_common_dont_ask(void)
+{
+       dont_ask = True;
+}
+
+static void popt_common_credentials_callback(poptContext con, 
+                                               enum poptCallbackReason reason,
+                                               const struct poptOption *opt,
+                                               const char *arg, const void *data)
+{
+       if (reason == POPT_CALLBACK_REASON_PRE) {
+               cmdline_credentials = cli_credentials_init(talloc_autofree_context());
+               return;
+       }
+       
+       if (reason == POPT_CALLBACK_REASON_POST) {
+               cli_credentials_guess(cmdline_credentials);
+
+               if (!dont_ask) {
+                       cli_credentials_set_cmdline_callbacks(cmdline_credentials);
+               }
+               return;
+       }
+
+       switch(opt->val) {
+       case 'U':
+               {
+                       char *lp;
+
+                       cli_credentials_parse_string(cmdline_credentials, arg, CRED_SPECIFIED);
+                       /* This breaks the abstraction, including the const above */
+                       if ((lp=strchr_m(arg,'%'))) {
+                               lp[0]='\0';
+                               lp++;
+                               memset(lp,0,strlen(lp));
+                       }
+               }
+               break;
+
+       case 'A':
+               cli_credentials_parse_file(cmdline_credentials, arg, CRED_SPECIFIED);
+               break;
+
+       case 'S':
+               lp_set_cmdline("client signing", arg);
+               break;
+
+       case 'P':
+               /* Later, after this is all over, get the machine account details from the secrets.ldb */
+               cli_credentials_set_machine_account_pending(cmdline_credentials);
+               
+               /* machine accounts only work with kerberos (fall though)*/
+               break;
+       case OPT_SIMPLE_BIND_DN:
+               cli_credentials_set_bind_dn(cmdline_credentials, arg);
+               break;
+       }
+}
+
+
+
+struct poptOption popt_common_credentials[] = {
+       { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, popt_common_credentials_callback },
+       { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN\\]USERNAME[%PASSWORD]" },
+       { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, True, "Don't ask for a password" },
+       { "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" },
+       { "signing", 'S', POPT_ARG_STRING, NULL, 'S', "Set the client signing state", "on|off|required" },
+       { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password (implies -k)" },
+       { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" },
+       POPT_TABLEEND
+};

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 2ae23c0fd4ae44179011b61eb63c72b541eb4e41..2ce0d5043df4074ab6370803f031bcad32a445a1 100644 (file)
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -115,7 +115,7 @@ OBJ_FILES = \
 [SUBSYSTEM::LIBLDB_CMDLINE]
 OBJ_FILES= \
                tools/cmdline.o
-REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC
+REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 # End SUBSYSTEM LIBLDB_CMDLINE
 ################################################
 

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 3f63c5be98e86a6a19653fe202fb5abcbc304037..c55f02aee72ab095bc10d4e73ce0dad785ef837f 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -102,7 +102,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
                tools/regdiff.o
 REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
+               CONFIG REGISTRY LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regdiff.1
 # End BINARY regdiff
 ################################################
@@ -114,7 +114,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
                tools/regpatch.o
 REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
+               CONFIG REGISTRY LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regpatch.1
 # End BINARY regpatch
 ################################################
@@ -126,7 +126,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
                tools/regshell.o
 REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
+               CONFIG LIBPOPT REGISTRY POPT_SAMBA POPT_CREDENTIALS LIBREADLINE
 MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
@@ -138,7 +138,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
                tools/regtree.o
 REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
+               CONFIG LIBPOPT REGISTRY POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################

diff --git a/source4/lib/replace/README b/source4/lib/replace/README
index 80a2d5c163431830069c7e237a5f05100594e834..19364e2faa5edec96d493031fc78acb49caea877 100644 (file)
--- a/source4/lib/replace/README
+++ b/source4/lib/replace/README
@@ -48,6 +48,8 @@ errno
 mkstemp (a secure one!)
 pread
 pwrite
+getpass
+readline (the library)
 
 Types:
 socklen_t

diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 70d13e40fd8b921867f468180f07dcf5b88386b2..379c14e77678de0c5748f49fe7228fd366c9dc79 100644 (file)
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -124,3 +124,6 @@ LIBS="$SAVE_LIBS"
 
 AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
                           [AC_MSG_ERROR([Required function not found])])
+
+sinclude(lib/replace/readline.m4)
+sinclude(lib/replace/getpass.m4)

diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
index 7ed33b2dc056a4a36ef193a1a405d6122b65a6bc..459465c64f03655f932f396920956c17a9fb40eb 100644 (file)
--- a/source4/lib/replace/config.mk
+++ b/source4/lib/replace/config.mk
@@ -7,13 +7,13 @@ NOPROTO = YES
 # End SUBSYSTEM REPLACE_READDIR
 ##############################
 
-
 ##############################
 # Start SUBSYSTEM LIBREPLACE
 [SUBSYSTEM::LIBREPLACE]
 OBJ_FILES = replace.o \
                snprintf.o \
-               dlfcn.o
+               dlfcn.o \
+               getpass.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = REPLACE_READDIR
 # End SUBSYSTEM LIBREPLACE

diff --git a/source4/lib/cmdline/getsmbpass.c b/source4/lib/replace/getpass.c
similarity index 100%
rename from source4/lib/cmdline/getsmbpass.c
rename to source4/lib/replace/getpass.c

diff --git a/source4/lib/replace/getpass.m4 b/source4/lib/replace/getpass.m4
new file mode 100644 (file)
index 0000000..2bd9d7b
--- /dev/null
+++ b/source4/lib/replace/getpass.m4
@@ -0,0 +1,15 @@
+AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt  -I${srcdir-.}/smbwrapper"
+AC_TRY_COMPILE([
+#define REPLACE_GETPASS 1
+#define NO_CONFIG_H 1
+#define main dont_declare_main
+#include "${srcdir-.}/lib/cmdline/getsmbpass.c"
+#undef main
+],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no)
+CPPFLAGS="$SAVE_CPPFLAGS"
+])
+if test x"$samba_cv_REPLACE_GETPASS" = x"yes"; then
+       AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
+fi

diff --git a/source4/lib/cmdline/readline.c b/source4/lib/replace/readline.c
similarity index 100%
rename from source4/lib/cmdline/readline.c
rename to source4/lib/replace/readline.c

diff --git a/source4/lib/cmdline/config.m4 b/source4/lib/replace/readline.m4
similarity index 72%
rename from source4/lib/cmdline/config.m4
rename to source4/lib/replace/readline.m4
index dd956642cda366d8e4ed6df4c3040ce68ecb7540..0d1aa60d17d49d825c196e73e62240e0e8f73c36 100644 (file)
--- a/source4/lib/cmdline/config.m4
+++ b/source4/lib/replace/readline.m4
@@ -1,5 +1,3 @@
-#################################################
-
 ###############################################
 # Readline included by default unless explicitly asked not to
 test "${with_readline+set}" != "set" && with_readline=yes
@@ -69,28 +67,6 @@ AC_CHECK_LIB(readline, rl_completion_matches,
             [],
             [$TERMLIBS])
 
-TMP_LIBCMDLINE_OBJS="lib/cmdline/readline.o lib/cmdline/popt_common.o"
-TMP_LIBCMDLINE_LIBS="$TERMLIBS"
-
-SMB_EXT_LIB(READLINE, [${TMP_LIBCMDLINE_LIBS}])
-
-SMB_SUBSYSTEM(LIBCMDLINE,
-               [${TMP_LIBCMDLINE_OBJS}],
-               [LIBPOPT EXT_LIB_READLINE LIBCMDLINE_CREDENTIALS])
-
-AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt  -I${srcdir-.}/smbwrapper"
-AC_TRY_COMPILE([
-#define REPLACE_GETPASS 1
-#define NO_CONFIG_H 1
-#define main dont_declare_main
-#include "${srcdir-.}/lib/cmdline/getsmbpass.c"
-#undef main
-],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no)
-CPPFLAGS="$SAVE_CPPFLAGS"
-])
-if test x"$samba_cv_REPLACE_GETPASS" = x"yes"; then
-       AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
-fi
+SMB_EXT_LIB(READLINE, [${TERMLIBS}])
 
+SMB_SUBSYSTEM(LIBREADLINE, [lib/replace/readline.o], [EXT_LIB_READLINE])

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 81741aece7f92b8cf338f634a750cc2562f20403..60db3ab07eab5b2bc3dc80475bae02b97f1ddcfd 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -38,5 +38,6 @@ OBJ_FILES = \
                connect_multi.o \
                connect.o
 NOPROTO=YES
+REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE
 # End SUBSYSTEM SOCKET
 ################################################

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index c3ebebed412f790d6cda2b93b14801376e6048d7..fb04c32d85d0a34309cc34fed99f21fabc483498 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -30,6 +30,9 @@ OBJ_FILES = \
        smb_composite/fsinfo.o 
 REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
 
+[SUBSYSTEM::NDR_NBT_BUF]
+OBJ_FILES = nbt/nbtname.o\
+
 [LIBRARY::LIBCLI_NBT]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
@@ -37,14 +40,13 @@ RELEASE_VERSION = 1
 DESCRIPTION = NetBios over TCP/IP client library
 PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
 OBJ_FILES = \
-       nbt/nbtname.o \
        nbt/nbtsocket.o \
        nbt/namequery.o \
        nbt/nameregister.o \
        nbt/namerefresh.o \
        nbt/namerelease.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
-       LIB_SECURITY_NDR
+       NDR_SECURITY
 
 [SUBSYSTEM::LIBCLI_DGRAM]
 OBJ_FILES = \

diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index b9fcb200386891d7f10550572fa420df4e603f7a..912cb133bf0b6a23b8dde2ea1884d4c3e7987b36 100644 (file)
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -8,6 +8,7 @@ OBJ_FILES = ldap.o \
                ldap_msg.o \
                ldap_ndr.o \
                ldap_ildap.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET RPC_NDR_SAMR LIBTLS
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET NDR_SAMR LIBTLS \
+                                         LIBPACKET
 # End SUBSYSTEM LIBCLI_LDAP
 #################################

diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 368a56d2b47e1356d0dfffe2f605c5a32bd1c945..a8de4995313205d896d1618324cfa15d9fe9482c 100644 (file)
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,19 +1,3 @@
-#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR_HELPER
-[SUBSYSTEM::LIB_SECURITY_NDR_HELPER]
-OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
-# End SUBSYSTEM LIB_SECURITY_NDR_HELPER
-#################################
-
-#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR
-[SUBSYSTEM::LIB_SECURITY_NDR]
-OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
-NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
-# End SUBSYSTEM LIB_SECURITY_NDR
-#################################
-
 #################################
 # Start SUBSYSTEM LIB_SECURITY
 [SUBSYSTEM::LIB_SECURITY]
@@ -22,8 +6,7 @@ OBJ_FILES = security_token.o \
                dom_sid.o \
                access_check.o \
                privilege.o \
-               sddl.o \
-               ../../librpc/ndr/ndr_sec.o
-REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR
+               sddl.o
+REQUIRED_SUBSYSTEMS = NDR_SECURITY
 # End SUBSYSTEM LIB_SECURITY
 #################################

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 556ff2ca13a32038c079398e80080e15c621f668..06254a67482f20367dbb80c5e8e3f3ec363a104e 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -28,6 +28,14 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
 
 include rpc/config.mk
 
+[SUBSYSTEM::NDR_SECURITY_HELPER]
+OBJ_FILES = ndr/ndr_sec_helper.o ndr/ndr_sec.o
+
+[SUBSYSTEM::NDR_SECURITY]
+OBJ_FILES = gen_ndr/ndr_security.o
+NOPROTO = YES
+REQUIRED_SUBSYSTEMS = NDR_SECURITY_HELPER
+
 [SUBSYSTEM::NDR_AUDIOSRV]
 OBJ_FILES = gen_ndr/ndr_audiosrv.o
 NOPROTO = YES
@@ -96,7 +104,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR
 [SUBSYSTEM::NDR_DRSUAPI]
 OBJ_FILES = gen_ndr/ndr_drsuapi.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION
+REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
 
 [SUBSYSTEM::NDR_DRSUAPI_PRINT]
 OBJ_FILES = ndr/ndr_drsuapi.o
@@ -250,7 +258,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR
 [SUBSYSTEM::NDR_NETLOGON]
 OBJ_FILES = gen_ndr/ndr_netlogon.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR
+REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
 
 [SUBSYSTEM::NDR_TRKWKS]
 OBJ_FILES = gen_ndr/ndr_trkwks.o
@@ -283,7 +291,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR
 [SUBSYSTEM::NDR_NBT]
 OBJ_FILES = gen_ndr/ndr_nbt.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
+REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF
 
 [SUBSYSTEM::NDR_WINSREPL]
 OBJ_FILES = gen_ndr/ndr_winsrepl.o
@@ -308,7 +316,7 @@ REQUIRED_SUBSYSTEMS = NDR_IFACE_TABLE NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHA
        NDR_WINREG NDR_MGMT NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER \
        NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_NTSVCS \
        NDR_NETLOGON NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \
-       NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL LIB_SECURITY_NDR \
+       NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL NDR_SECURITY \
        NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM
 
 [SUBSYSTEM::RPC_NDR_ROT]
@@ -543,7 +551,7 @@ NOPROTO = YES
 INIT_FUNCTION = ejs_init_security
 OBJ_FILES = gen_ndr/ndr_security_ejs.o
 SUBSYSTEM = SMBCALLS
-REQUIRED_SUBSYSTEMS = LIBRPC LIB_SECURITY_NDR
+REQUIRED_SUBSYSTEMS = LIBRPC NDR_SECURITY
 NOPROTO = YES
 
 [MODULE::RPC_EJS_LSA]

diff --git a/source4/param/config.mk b/source4/param/config.mk
index ded7456c207e473ad461350a3c5a55560327033c..cf21871503853c819833ec89a98fd0c6f5863679 100644 (file)
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -4,3 +4,4 @@ OBJ_FILES = ../dynconfig.o \
                                params.o \
                                ../passdb/secrets.o \
                                generic.o
+REQUIRED_SUBSYSTEMS = LIBBASIC DB_WRAP

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 902fed2fd7167470a4b183265084fad72bbd7613..47e4b99becbafc6317291654aab1d944ad03b0be 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -30,7 +30,8 @@ OBJ_FILES = \
                ejsnet.o \
                mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
-                                         NDR_ALL
+                                         NDR_ALL LIBSMB LIBPOPT POPT_CREDENTIALS \
+                                         POPT_SAMBA
 # End SUBSYSTEM SMBCALLS
 #######################
 
@@ -40,6 +41,6 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB LIBRPC LIBCMDLINE
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
 # End BINARY SMBSCRIPT
 #######################

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 8c54d794323a46ded9b72ca2e2c392964ae499e4..7378b3b2c31feecf6f8348b2fcc429dd3a83a0c8 100644 (file)
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -122,8 +122,9 @@ REQUIRED_SUBSYSTEMS = \
                PROCESS_MODEL \
                SERVER_SERVICE \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
-               PIDFILE
+               PIDFILE \
+               POPT_SAMBA \
+               LIBPOPT
 # End BINARY smbd
 #################################

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index ec79675f65038d9e1b25503c51b2c8f079b44f2f..a1776767ff772486b0f8189b4769c0ee24d9c77a 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -216,8 +216,10 @@ REQUIRED_SUBSYSTEMS = \
                TORTURE_NBT \
                TORTURE_NET \
                CONFIG \
-               LIBCMDLINE \
-               LIBBASIC
+               LIBBASIC \
+               LIBPOPT \
+               POPT_SAMBA \
+               POPT_CREDENTIALS
 MANPAGE = man/smbtorture.1
 # End BINARY smbtorture
 #################################
@@ -232,9 +234,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                CONFIG \
-               LIBBASIC \
-               LIBCMDLINE \
-               LIBRPC
+               LIBBASIC
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
@@ -248,9 +248,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                CONFIG \
-               LIBBASIC \
-               LIBCMDLINE \
-               LIBRPC
+               LIBBASIC
 MANPAGE = man/masktest.1
 # End BINARY masktest
 #################################
@@ -265,9 +263,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                CONFIG \
-               LIBBASIC \
-               LIBCMDLINE \
-               LIBRPC
+               LIBBASIC
 MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index f53fca38dfe2bcc131fecd49132da098ef5484ea..61a0af34f523d81a8a4f7294e6f69c426b8bbe2a 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2614,6 +2614,7 @@ static void max_runtime_handler(int sig)
 
        smbtorture_init_subsystems;
 
+       dcerpc_table_init();
 
        if (torture_seed == 0) {
                torture_seed = time(NULL);

diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index ac7739fd4b729447ddde176f06b212d296e1c3f2..860d2c73a1544ab440276d2de44c1e71046f2ffc 100644 (file)
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -8,10 +8,10 @@ OBJ_FILES = \
                ndrdump.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
                NDR_ALL \
-               LIBRPC
+               LIBPOPT \
+               POPT_SAMBA
 MANPAGE = man/ndrdump.1
 # FIXME: ndrdump shouldn't have to depend on RPC...
 # End BINARY ndrdump
@@ -25,10 +25,9 @@ OBJ_FILES = \
                ntlm_auth.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
-               LIBSMB \
-               LIBRPC
+               LIBPOPT \
+               POPT_SAMBA
 MANPAGE = man/ntlm_auth.1
 # End BINARY ntlm_auth
 #################################
@@ -41,9 +40,7 @@ OBJ_FILES = \
                getntacl.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
-               LIBRPC \
                NDR_XATTR \
                EXT_LIB_XATTR
 # End BINARY getntacl
@@ -57,9 +54,8 @@ OBJ_FILES = \
                setntacl.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
-               LIBRPC
+               NDR_XATTR
 # End BINARY setntacl
 #################################
 
@@ -71,9 +67,7 @@ OBJ_FILES = \
                setnttoken.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
-               LIBRPC \
                NDR_XATTR \
                NDR_SAMR
 # End BINARY setnttoken
@@ -87,9 +81,9 @@ OBJ_FILES = \
                nmblookup.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
                LIBCLI_NBT \
-               LIB_SECURITY_NDR
+               LIBPOPT \
+               POPT_SAMBA
 # End BINARY nmblookup
 #################################

diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index abc6d95fb4db0bc4f2575a19d0cc7548446ee5ce..33bffe77b58ba4f8ba8ec4ccdd4d41c9356145df 100644 (file)
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -127,7 +127,7 @@ static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
                POPT_TABLEEND
        };
 
-       ndrdump_init_subsystems;
+       dcerpc_table_init();
 
        pc = poptGetContext("ndrdump", argc, argv, long_options, 0);
        

diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index e9f7e6ef520fd12c6cc3144fa6f386057d08372a..3d45bcec778fa6ad09c48cc90a1a03ec114a327c 100644 (file)
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -14,9 +14,10 @@ OBJ_FILES = \
                net_user.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
-               LIBCMDLINE \
                LIBBASIC \
-               LIBSMB \
-               LIBNET
+               LIBNET \
+               LIBPOPT \
+               POPT_SAMBA \
+               POPT_CREDENTIALS
 # End BINARY net
 #################################