svn commit: samba r19573 - in branches/SAMBA_4_0/source: .
auth/credentials libnet param rpc_server/lsa smbd winbind
jelmer at samba.org
jelmer at samba.org
Mon Nov 6 16:11:53 GMT 2006
Author: jelmer
Date: 2006-11-06 16:11:52 +0000 (Mon, 06 Nov 2006)
New Revision: 19573
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19573
Log:
Move secrets.o into param/ (subsystems haven't been integrated yet).
Added:
branches/SAMBA_4_0/source/param/secrets.c
branches/SAMBA_4_0/source/param/secrets.h
Removed:
branches/SAMBA_4_0/source/passdb/
Modified:
branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
branches/SAMBA_4_0/source/libnet/libnet_join.c
branches/SAMBA_4_0/source/main.mk
branches/SAMBA_4_0/source/param/config.mk
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
branches/SAMBA_4_0/source/smbd/process_standard.c
branches/SAMBA_4_0/source/smbd/server.c
branches/SAMBA_4_0/source/winbind/wb_server.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c 2006-11-06 16:11:52 UTC (rev 19573)
@@ -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"
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_join.c 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c 2006-11-06 16:11:52 UTC (rev 19573)
@@ -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"
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/main.mk 2006-11-06 16:11:52 UTC (rev 19573)
@@ -31,7 +31,6 @@
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 \
Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/param/config.mk 2006-11-06 16:11:52 UTC (rev 19573)
@@ -44,3 +44,7 @@
# End MODULE share_ldb
################################################
+[SUBSYSTEM::SECRETS]
+PRIVATE_PROTO_HEADER = secrets_proto.h
+OBJ_FILES = secrets.o
+PRIVATE_DEPENDENCIES = DB_WRAP UTIL_TDB
Copied: branches/SAMBA_4_0/source/param/secrets.c (from rev 19572, branches/SAMBA_4_0/source/passdb/secrets.c)
Copied: branches/SAMBA_4_0/source/param/secrets.h (from rev 19572, branches/SAMBA_4_0/source/passdb/secrets.h)
===================================================================
--- branches/SAMBA_4_0/source/passdb/secrets.h 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/param/secrets.h 2006-11-06 16:11:52 UTC (rev 19573)
@@ -0,0 +1,40 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * secrets.tdb file format info
+ * Copyright (C) Andrew Tridgell 2000
+ *
+ * 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.
+ */
+
+#ifndef _SECRETS_H
+#define _SECRETS_H
+
+/* structure for storing machine account password
+ (ie. when samba server is member of a domain */
+struct machine_acct_pass {
+ uint8_t hash[16];
+ time_t mod_time;
+};
+
+#define SECRETS_PRIMARY_DOMAIN_DN "cn=Primary Domains"
+#define SECRETS_PRINCIPALS_DN "cn=Principals"
+#define SECRETS_PRIMARY_DOMAIN_FILTER "(&(flatname=%s)(objectclass=primaryDomain))"
+#define SECRETS_PRIMARY_REALM_FILTER "(&(realm=%s)(objectclass=primaryDomain))"
+#define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))"
+#define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))"
+
+#include "param/secrets_proto.h"
+
+#endif /* _SECRETS_H */
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2006-11-06 16:11:52 UTC (rev 19573)
@@ -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"
Modified: branches/SAMBA_4_0/source/smbd/process_standard.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_standard.c 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/smbd/process_standard.c 2006-11-06 16:11:52 UTC (rev 19573)
@@ -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
Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/smbd/server.c 2006-11-06 16:11:52 UTC (rev 19573)
@@ -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"
/*
Modified: branches/SAMBA_4_0/source/winbind/wb_server.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_server.c 2006-11-06 14:07:20 UTC (rev 19572)
+++ branches/SAMBA_4_0/source/winbind/wb_server.c 2006-11-06 16:11:52 UTC (rev 19573)
@@ -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)
{
More information about the samba-cvs
mailing list