diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-29 17:34:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:17 -0500 |
| commit | e002300f238dd0937dd9f768e366c006945e8baa (patch) | |
| tree | 87bc52b059c4331faac801876d4a567f08659d85 /source4/dsdb | |
| parent | 1a4effad3d4c9d69a8aec4a7bb509c4dff309edb (diff) | |
| download | samba-e002300f238dd0937dd9f768e366c006945e8baa.tar.gz samba-e002300f238dd0937dd9f768e366c006945e8baa.tar.bz2 samba-e002300f238dd0937dd9f768e366c006945e8baa.zip | |
r15328: Move some functions around, remove dependencies.
Remove some autogenerated headers (which had prototypes now autogenerated by pidl)
Remove ndr_security.h from a few places - it's no longer necessary
(This used to be commit c19c2b51d3e1ad347120b06a22bda5ec586c22e8)
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/common/sidmap.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/cracknames.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index 2b1de42cf0..3590c57b84 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -28,7 +28,6 @@ #include "libcli/ldap/ldap.h" #include "db_wrap.h" #include "libcli/security/security.h" -#include "librpc/gen_ndr/ndr_security.h" /* these are used for the fallback local uid/gid to sid mapping @@ -43,7 +42,7 @@ private context for sid mapping routines */ struct sidmap_context { - struct ldb_wrap *samctx; + struct ldb_context *samctx; }; /* diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 7d6fe70248..c0d320f106 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -30,10 +30,10 @@ #include "auth/kerberos/kerberos.h" #include "libcli/ldap/ldap.h" #include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_misc.h" #include "auth/auth.h" #include "db_wrap.h" #include "dsdb/samdb/samdb.h" -#include "librpc/gen_ndr/ndr_security.h" static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx, struct smb_krb5_context *smb_krb5_context, diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c index 87446328f6..e421f7d13c 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c @@ -36,8 +36,9 @@ #include "ldb/include/ldb.h" #include "ldb/include/ldb_errors.h" #include "ldb/include/ldb_private.h" +#include "librpc/gen_ndr/ndr_misc.h" #include "dsdb/samdb/samdb.h" -#include "librpc/gen_ndr/ndr_security.h" +#include "libcli/security/security.h" #include <time.h> diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 8a5f94042a..0310fbf9e3 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -36,8 +36,8 @@ #include "ldb/include/ldb_private.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" -#include "librpc/gen_ndr/ndr_security.h" #include "libcli/auth/libcli_auth.h" +#include "libcli/security/security.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" #include "system/time.h" |