diff options
| -rw-r--r-- | source4/auth/credentials/credentials_files.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 | ||||
| -rw-r--r-- | source4/main.mk | 1 | ||||
| -rw-r--r-- | source4/param/config.mk | 4 | ||||
| -rw-r--r-- | source4/param/secrets.c (renamed from source4/passdb/secrets.c) | 0 | ||||
| -rw-r--r-- | source4/param/secrets.h (renamed from source4/passdb/secrets.h) | 2 | ||||
| -rw-r--r-- | source4/passdb/config.mk | 5 | ||||
| -rw-r--r-- | source4/rpc_server/lsa/dcesrv_lsa.c | 2 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 2 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_server.c | 2 |
11 files changed, 11 insertions, 13 deletions
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index c61f8ccb5e..53a6f39cd4 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -25,7 +25,7 @@ #include "includes.h" #include "lib/ldb/include/ldb.h" #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */ -#include "passdb/secrets.h" +#include "param/secrets.h" #include "system/filesys.h" #include "db_wrap.h" #include "auth/credentials/credentials.h" diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 96d9e7f0de..b0907c5461 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -25,7 +25,7 @@ #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "passdb/secrets.h" +#include "param/secrets.h" #include "dsdb/samdb/samdb.h" #include "db_wrap.h" #include "libcli/security/security.h" diff --git a/source4/main.mk b/source4/main.mk index 3eaf35da4e..8b4adac1a2 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -31,7 +31,6 @@ include libcli/config.mk include scripting/ejs/config.mk include scripting/swig/config.mk include kdc/config.mk -include passdb/config.mk DEFAULT_HEADERS = $(srcdir)/include/core.h \ $(srcdir)/lib/util/dlinklist.h \ diff --git a/source4/param/config.mk b/source4/param/config.mk index 63609490a3..3406b4f952 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -44,3 +44,7 @@ PUBLIC_DEPENDENCIES = ldb # End MODULE share_ldb ################################################ +[SUBSYSTEM::SECRETS] +PRIVATE_PROTO_HEADER = secrets_proto.h +OBJ_FILES = secrets.o +PRIVATE_DEPENDENCIES = DB_WRAP UTIL_TDB diff --git a/source4/passdb/secrets.c b/source4/param/secrets.c index 876be607f1..876be607f1 100644 --- a/source4/passdb/secrets.c +++ b/source4/param/secrets.c diff --git a/source4/passdb/secrets.h b/source4/param/secrets.h index adbc9e1586..8ef7ec5f78 100644 --- a/source4/passdb/secrets.h +++ b/source4/param/secrets.h @@ -35,6 +35,6 @@ struct machine_acct_pass { #define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))" #define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))" -#include "passdb/proto.h" +#include "param/secrets_proto.h" #endif /* _SECRETS_H */ diff --git a/source4/passdb/config.mk b/source4/passdb/config.mk deleted file mode 100644 index 81897323c9..0000000000 --- a/source4/passdb/config.mk +++ /dev/null @@ -1,5 +0,0 @@ -[SUBSYSTEM::SECRETS] -PRIVATE_PROTO_HEADER = proto.h -OBJ_FILES = secrets.o -PRIVATE_DEPENDENCIES = DB_WRAP UTIL_TDB - diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index c5c85a35fe..099464042d 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -30,7 +30,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" -#include "passdb/secrets.h" +#include "param/secrets.h" #include "db_wrap.h" #include "librpc/gen_ndr/ndr_dssetup.h" diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index a426a2473b..1efdd3d0c4 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -32,7 +32,7 @@ #include "system/kerberos.h" #include "heimdal/lib/gssapi/gssapi_locl.h" -#include "passdb/secrets.h" +#include "param/secrets.h" #ifdef HAVE_SETPROCTITLE #ifdef HAVE_SETPROCTITLE_H diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 2239f33d17..48c8c8ab55 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -37,7 +37,7 @@ #include "auth/gensec/gensec.h" #include "smbd/process_model.h" #include "smbd/service.h" -#include "passdb/secrets.h" +#include "param/secrets.h" #include "smbd/pidfile.h" /* diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index 4c6ff397c1..2e69785261 100644 --- a/source4/winbind/wb_server.c +++ b/source4/winbind/wb_server.c @@ -31,7 +31,7 @@ #include "winbind/wb_server.h" #include "lib/stream/packet.h" #include "smbd/service.h" -#include "passdb/secrets.h" +#include "param/secrets.h" void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason) { |