diff options
| author | Günther Deschner <gd@samba.org> | 2006-04-11 14:40:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:58 -0500 |
| commit | 9608b4328d9ffd4b8d38e1dc872f68d80dd1cc22 (patch) | |
| tree | c2386da4e526aebc8cdb15f177822ff2e0b3ff04 /source3/Makefile.in | |
| parent | f340b2fa367d7a888c0dc24ff57f2aed7e9c88bb (diff) | |
| download | samba-9608b4328d9ffd4b8d38e1dc872f68d80dd1cc22.tar.gz samba-9608b4328d9ffd4b8d38e1dc872f68d80dd1cc22.tar.bz2 samba-9608b4328d9ffd4b8d38e1dc872f68d80dd1cc22.zip | |
r15038: Replace all code in pam_winbind that relied on access to samba
internals, mostly with the code that was in pam_winbind before.
Also switch from using loadparm to use iniParser to read the new
pam_winbind options from a configuration file. That still uses the old
(parametric) option names which will be replaced next (as iniParser does
not support parametric options).
Guenther
(This used to be commit 6f668ce67318f17bba79cd98b5d169cd19eafcd4)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4d43fea762..a66f103bba 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -116,7 +116,7 @@ LIBSMBSHAREMODES_MAJOR=0 LIBSMBSHAREMODES_MINOR=2 FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_ -FLAGS2 = +FLAGS2 = -I$(srcdir)/iniparser/src FLAGS3 = FLAGS4 = FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) @@ -511,9 +511,9 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ $(LIBADS_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) -PAM_WINBIND_OBJ = nsswitch/pam_winbind.o \ - $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ1) \ - $(LIBSAMBA_OBJ) $(DOSERR_OBJ) $(SECRETS_OBJ) +PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \ + lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ) \ + dynconfig.o PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=.@PICSUFFIX@) @@ -743,6 +743,9 @@ WINBIND_NSS_PICOBJS = $(WINBIND_NSS_OBJ:.o=.@PICSUFFIX@) lib/snprintf.@PICSUFFIX POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o +INIPARSER_OBJ = iniparser/src/iniparser.o iniparser/src/dictionary.o \ + iniparser/src/strlib.o + TDBBACKUP_OBJ = tdb/tdbbackup.o tdb/tdbback.o $(SNPRINTF_OBJ) $(TDBBASE_OBJ) TDBTOOL_OBJ = tdb/tdbtool.o $(TDBBASE_OBJ) $(SNPRINTF_OBJ) |