summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2000-12-08 02:59:49 +0000
committerTim Potter <tpot@samba.org>2000-12-08 02:59:49 +0000
commit00ac8b37089f3315a9de28de5d585f2605356fb4 (patch)
tree3bd57dc24bfcf74e486a1845ddb2c974593b747d
parent2e79da814da91f9682b73aa1e3285f1be4aa05b0 (diff)
downloadsamba-00ac8b37089f3315a9de28de5d585f2605356fb4.tar.gz
samba-00ac8b37089f3315a9de28de5d585f2605356fb4.tar.bz2
samba-00ac8b37089f3315a9de28de5d585f2605356fb4.zip
Compile fixes for changes in make_sec_desc() interface.
(This used to be commit 7b896697d134eb4fad1ceef5cdd2dab2b5980187)
-rw-r--r--testsuite/printing/Makefile.psec5
-rw-r--r--testsuite/printing/psec.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/testsuite/printing/Makefile.psec b/testsuite/printing/Makefile.psec
index 810bc57792..1410c9e009 100644
--- a/testsuite/printing/Makefile.psec
+++ b/testsuite/printing/Makefile.psec
@@ -13,9 +13,10 @@ psec_default: psec
include ../../source/Makefile
-PSEC_OBJ1 = $(LIB_OBJ) $(PARAM_OBJ) $(UBIQX_OBJ) $(RPC_PARSE_OBJ) $(LIBSMB_OBJ)
+PSEC_OBJ1 = $(LIB_OBJ) $(PARAM_OBJ) $(UBIQX_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIBSMB_OBJ) $(PASSDB_OBJ) $(RPC_CLIENT_OBJ)
PSEC_OBJS = $(PSEC_OBJ1:%=$(srcdir)/%)
psec: $(PSEC_OBJS) psec.o
- $(CC) -o $@ psec.o $(PSEC_OBJS)
+ $(CC) -o $@ psec.o $(PSEC_OBJS) $(LIBS)
diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c
index fa26ed7dff..88a111404c 100644
--- a/testsuite/printing/psec.c
+++ b/testsuite/printing/psec.c
@@ -144,7 +144,7 @@ char *ace_to_str(SEC_ACE *ace)
return temp;
}
-int str_to_ace(SEC_ACE *ace, char *ace_str)
+void str_to_ace(SEC_ACE *ace, char *ace_str)
{
SEC_ACCESS sa;
DOM_SID sid;
@@ -232,7 +232,6 @@ int psec_getsec(char *printer)
for (i = 0; i < secdesc_ctr->sec->dacl->num_aces; i++) {
SEC_ACE *ace = &secdesc_ctr->sec->dacl->ace[i];
- fstring sidstr;
sid_to_string(sidstr, &ace->sid);
@@ -324,8 +323,7 @@ int psec_setsec(char *printer)
/* Create security descriptor */
- sd = make_sec_desc(SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE |
- SEC_DESC_DACL_PRESENT,
+ sd = make_sec_desc(SEC_DESC_REVISION,
has_user_sid ? &user_sid : NULL,
has_group_sid ? &group_sid : NULL,
NULL, /* System ACL */