From 7b896697d134eb4fad1ceef5cdd2dab2b5980187 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 8 Dec 2000 02:59:49 +0000
Subject: Compile fixes for changes in make_sec_desc() interface.

---
 testsuite/printing/Makefile.psec | 5 +++--
 testsuite/printing/psec.c        | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/printing/Makefile.psec b/testsuite/printing/Makefile.psec
index 810bc57792b..1410c9e0099 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 fa26ed7dfff..88a111404c9 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 */
-- 
cgit