diff options
| author | Günther Deschner <gd@samba.org> | 2011-01-07 12:01:42 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-01-07 15:02:24 +0100 |
| commit | 3294ccbb6d2ce26da5b6b9b512dfc1184a153d26 (patch) | |
| tree | 0868b01bb903571d8141ca07124649cc56a0dad0 /libcli | |
| parent | 75c8e429383d0d5d4cb13e769d66d87a64252e42 (diff) | |
| download | samba-3294ccbb6d2ce26da5b6b9b512dfc1184a153d26.tar.gz samba-3294ccbb6d2ce26da5b6b9b512dfc1184a153d26.tar.bz2 samba-3294ccbb6d2ce26da5b6b9b512dfc1184a153d26.zip | |
netlogon: move netlogon helpers to ../libcli/netlogon.
Guenther
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/cldap/cldap.h | 2 | ||||
| -rw-r--r-- | libcli/nbt/wscript_build | 12 | ||||
| -rw-r--r-- | libcli/netlogon/ndr_netlogon.c (renamed from libcli/ndr_netlogon.c) | 2 | ||||
| -rw-r--r-- | libcli/netlogon/ndr_netlogon_proto.h (renamed from libcli/ndr_netlogon_proto.h) | 0 | ||||
| -rw-r--r-- | libcli/netlogon/netlogon.c (renamed from libcli/netlogon.c) | 2 | ||||
| -rw-r--r-- | libcli/netlogon/netlogon.h (renamed from libcli/netlogon.h) | 4 | ||||
| -rw-r--r-- | libcli/netlogon/netlogon_proto.h (renamed from libcli/netlogon_proto.h) | 0 | ||||
| -rw-r--r-- | libcli/netlogon/wscript_build | 11 |
8 files changed, 16 insertions, 17 deletions
diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h index d05e5b9936..d1197481fb 100644 --- a/libcli/cldap/cldap.h +++ b/libcli/cldap/cldap.h @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" struct ldap_message; struct tsocket_address; diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index 9cae6e0195..7229d12e2e 100644 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -21,18 +21,6 @@ bld.SAMBA_BINARY('nmblookup', ) -bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', - source='../ndr_netlogon.c', - public_deps='ndr NDR_SECURITY' - ) - - -bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', - source='../netlogon.c', - public_deps='samba-util LIBCLI_NDR_NETLOGON' - ) - - bld.SAMBA_PYTHON('python_netbios', source='pynbt.c', public_deps='cli-nbt DYNCONFIG samba-hostconfig', diff --git a/libcli/ndr_netlogon.c b/libcli/netlogon/ndr_netlogon.c index d15154d2c9..7d6aa974b0 100644 --- a/libcli/ndr_netlogon.c +++ b/libcli/netlogon/ndr_netlogon.c @@ -22,7 +22,7 @@ /* parser auto-generated by pidl, then hand-modified by abartlet */ #include "includes.h" -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" /* Manually modified to handle the dom_sid being optional based on if it is present or all zero */ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_REQUEST *r) diff --git a/libcli/ndr_netlogon_proto.h b/libcli/netlogon/ndr_netlogon_proto.h index ca61c16138..ca61c16138 100644 --- a/libcli/ndr_netlogon_proto.h +++ b/libcli/netlogon/ndr_netlogon_proto.h diff --git a/libcli/netlogon.c b/libcli/netlogon/netlogon.c index ceb1c85c56..d82a2013b8 100644 --- a/libcli/netlogon.c +++ b/libcli/netlogon/netlogon.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" NTSTATUS push_netlogon_samlogon_response(DATA_BLOB *data, TALLOC_CTX *mem_ctx, struct netlogon_samlogon_response *response) diff --git a/libcli/netlogon.h b/libcli/netlogon/netlogon.h index 3e626ed40d..9bf346af26 100644 --- a/libcli/netlogon.h +++ b/libcli/netlogon/netlogon.h @@ -50,6 +50,6 @@ struct nbt_netlogon_response } data; }; -#include "../libcli/netlogon_proto.h" -#include "../libcli/ndr_netlogon_proto.h" +#include "../libcli/netlogon/netlogon_proto.h" +#include "../libcli/netlogon/ndr_netlogon_proto.h" #endif /* __CLDAP_SERVER_PROTO_H__ */ diff --git a/libcli/netlogon_proto.h b/libcli/netlogon/netlogon_proto.h index 53c7d004ee..53c7d004ee 100644 --- a/libcli/netlogon_proto.h +++ b/libcli/netlogon/netlogon_proto.h diff --git a/libcli/netlogon/wscript_build b/libcli/netlogon/wscript_build new file mode 100644 index 0000000000..6c5e57ba67 --- /dev/null +++ b/libcli/netlogon/wscript_build @@ -0,0 +1,11 @@ +#!/usr/bin/env python + +bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', + source='ndr_netlogon.c', + public_deps='ndr NDR_SECURITY' + ) + +bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', + source='netlogon.c', + public_deps='samba-util LIBCLI_NDR_NETLOGON' + ) |