summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-09-22 09:07:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:01:03 -0500
commit0d12a35e6b4434f8aef4431f96cf67857ada31c0 (patch)
treeee44ec8c995e5df48564e79601eccf1cc31253b9 /source3
parent314d563b12cecb357d3ad472291bd33fa78a9b63 (diff)
downloadsamba-0d12a35e6b4434f8aef4431f96cf67857ada31c0.tar.gz
samba-0d12a35e6b4434f8aef4431f96cf67857ada31c0.tar.bz2
samba-0d12a35e6b4434f8aef4431f96cf67857ada31c0.zip
r18817: Enable the build of the gpo tool but do not make it available yet.
Guenther (This used to be commit 927cda5d31e9cb02105df3cfc06f5cb273233747)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in8
-rw-r--r--source3/libads/gpo_util.c2
-rw-r--r--source3/utils/net_ads.c3
3 files changed, 8 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 252f122c08..662b1feb6f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -267,7 +267,8 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o libads/sasl.o \
libads/krb5_setpw.o libads/ldap_user.o \
libads/ads_struct.o libads/kerberos_keytab.o \
libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
- libads/authdata.o libads/cldap.o
+ libads/authdata.o libads/cldap.o \
+ libads/gpo.o libads/gpo_util.o
LIBADS_SERVER_OBJ = libads/util.o libads/kerberos_verify.o \
libads/ldap_schema.o sam/nss_info.o
@@ -290,7 +291,8 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
libsmb/clioplock.o $(ERRORMAP_OBJ) libsmb/clirap2.o \
$(DOSERR_OBJ) \
- $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(LIBNMB_OBJ)
+ $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(LIBNMB_OBJ) \
+ libsmb/gpo.o
LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
rpc_client/cli_netlogon.o \
@@ -604,7 +606,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_domain.o utils/net_help.o \
utils/net_rpc_service.o utils/net_rpc_registry.o utils/net_usershare.o \
utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
- utils/passwd_util.o utils/net_dns.o
+ utils/passwd_util.o utils/net_dns.o utils/net_ads_gpo.o
NET_OBJ = $(NET_OBJ1) $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
$(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
diff --git a/source3/libads/gpo_util.c b/source3/libads/gpo_util.c
index 7df38eb125..cabe9a32db 100644
--- a/source3/libads/gpo_util.c
+++ b/source3/libads/gpo_util.c
@@ -23,7 +23,7 @@
#define DEFAULT_DOMAIN_POLICY "Default Domain Policy"
#define DEFAULT_DOMAIN_CONTROLLERS_POLICY "Default Domain Controllers Policy"
-/* should we store a parsed guid ? UUID_FLAT guid; */
+/* should we store a parsed guid ? */
struct gpo_table {
const char *name;
const char *guid_string;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 3fa1be78c1..e5b144cf25 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -219,7 +219,7 @@ static void use_in_memory_ccache(void) {
setenv(KRB5_ENV_CCNAME, "MEMORY:net_ads", 1);
}
-static ADS_STATUS ads_startup(BOOL only_own_domain, ADS_STRUCT **ads)
+ADS_STATUS ads_startup(BOOL only_own_domain, ADS_STRUCT **ads)
{
ADS_STATUS status;
BOOL need_password = False;
@@ -2245,6 +2245,7 @@ int net_ads(int argc, const char **argv)
{"WORKGROUP", net_ads_workgroup},
{"LOOKUP", net_ads_lookup},
{"KEYTAB", net_ads_keytab},
+ /* {"GPO", net_ads_gpo}, */
{"HELP", net_ads_help},
{NULL, NULL}
};