summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-03-11 00:44:30 +0000
committerJeremy Allison <jra@samba.org>2001-03-11 00:44:30 +0000
commitce069f413215185bd7d248ad7c5b49a17c5b247e (patch)
tree2d272678c1c424c92b94ad312a123df778f5155b
parentd47ee4bffcc849a4f8193986a992c26c1466384c (diff)
downloadsamba-ce069f413215185bd7d248ad7c5b49a17c5b247e.tar.gz
samba-ce069f413215185bd7d248ad7c5b49a17c5b247e.tar.bz2
samba-ce069f413215185bd7d248ad7c5b49a17c5b247e.zip
Ok - everything now compiles in HEAD (at least the default stuff). We
should now be ready for the trivial winbindd port..... (Tim ? :-). Jeremy. (This used to be commit 85021b16388e8efc15ac57bf1a7c01bba552bf41)
-rw-r--r--source3/Makefile.in11
-rw-r--r--source3/libsmb/cli_samr.c2
2 files changed, 3 insertions, 10 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c088602baa..958cd2aa19 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -148,13 +148,6 @@ RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_net.o \
rpc_parse/parse_spoolss.o rpc_parse/parse_dfs.o \
rpc_parse/parse_creds.o
-RPC_PARSE_NEW_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_net.o \
- rpc_parse/parse_reg.o rpc_parse/parse_rpc.o \
- rpc_parse/parse_srv.o \
- rpc_parse/parse_wks.o \
- rpc_parse/parse_spoolss.o rpc_parse/parse_dfs.o \
- rpc_parse/parse_creds.o
-
RPC_CLIENT_OBJ = \
rpc_client/cli_login.o \
rpc_client/cli_netlogon.o \
@@ -268,7 +261,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
- $(RPC_PARSE_NEW_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_OBJ)
+ $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_OBJ)
PAM_WINBIND_OBJ = nsswitch/pam_winbind.po nsswitch/wb_common.po
@@ -313,7 +306,7 @@ LOCKTEST_OBJ = utils/locktest.o $(LOCKING_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) \
SMBCACLS_OBJ = utils/smbcacls.o $(LOCKING_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) \
- $(UBIQX_OBJ) $(LIB_OBJ) $(RPC_PARSE_NEW_OBJ) $(PASSDB_OBJ) \
+ $(UBIQX_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) \
$(LIBMSRPC_OBJ)
diff --git a/source3/libsmb/cli_samr.c b/source3/libsmb/cli_samr.c
index cf11110bd3..4c53bd0584 100644
--- a/source3/libsmb/cli_samr.c
+++ b/source3/libsmb/cli_samr.c
@@ -314,7 +314,7 @@ uint32 cli_samr_open_group(struct cli_state *cli, POLICY_HND *domain_pol,
/* Return output parameters */
if ((result = r.status) == NT_STATUS_NOPROBLEMO) {
- *group_pol = r.group_pol;
+ *group_pol = r.pol;
}
done: