mirror of
https://github.com/samba-team/samba.git
synced 2025-01-22 22:04:08 +03:00
in head as well ...
renamed ntdom to winbind I think that using winbind in /etc/nsswitch.conf is better than ntdom (This used to be commit 80f85b5359c26dc26f8f88b984f27cfa4ac34e61)
This commit is contained in:
parent
a71d9b291c
commit
4f21301ea6
@ -313,9 +313,9 @@ WINBINDD_OBJ = \
|
||||
$(LIBNMB_OBJ) $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
|
||||
$(NSSWINS_OBJ) $(SIDDB_OBJ) $(LIBSMB_OBJ)
|
||||
|
||||
NTDOM_OBJ = nsswitch/ntdom.o nsswitch/common.o
|
||||
WINBIND_NSS_OBJ = nsswitch/winbind.o nsswitch/common.o
|
||||
|
||||
NTDOM_PICOBJS = $(NTDOM_OBJ:.o=.po)
|
||||
WINBIND_NSS_PICOBJS = $(WINBIND_NSS_OBJ:.o=.po)
|
||||
|
||||
|
||||
######################################################################
|
||||
@ -538,15 +538,15 @@ bin/winbindd: $(WINBINDD_OBJ) bin/.dummy
|
||||
@echo Linking $@
|
||||
@$(LINK) -o $@ $(WINBINDD_OBJ) $(LIBS)
|
||||
|
||||
nsswitch/libnss_ntdom.so: $(NTDOM_PICOBJS)
|
||||
nsswitch/libnss_winbind.so: $(WINBIND_NSS_PICOBJS)
|
||||
@echo "Linking $@"
|
||||
@$(LINK) -shared -o $@ $(NTDOM_PICOBJS)
|
||||
@$(LINK) -shared -o $@ $(WINBIND_NSS_PICOBJS)
|
||||
|
||||
nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) bin/.dummy
|
||||
@echo Linking $@
|
||||
@$(LINK) -shared -o $@ $(PAM_WINBIND_OBJ)
|
||||
|
||||
nsswitch: nsswitch/libnss_wins.so nsswitch/pam_winbind.so nsswitch/libnss_ntdom.so
|
||||
nsswitch: nsswitch/libnss_wins.so nsswitch/pam_winbind.so nsswitch/libnss_winbind.so
|
||||
|
||||
install: installbin installman installscripts installcp installswat
|
||||
|
||||
|
@ -23,8 +23,8 @@
|
||||
Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "ntdom_config.h"
|
||||
#include "winbindd_ntdom.h"
|
||||
#include "winbind_nss_config.h"
|
||||
#include "winbindd_nss.h"
|
||||
|
||||
/* Global variables. These are effectively the client state information */
|
||||
|
||||
|
@ -26,8 +26,8 @@
|
||||
#define PAM_USE_AUTHTOK_ARG (1<<1)
|
||||
#define PAM_UNKNOWN_OK_ARG (1<<2)
|
||||
|
||||
#include "ntdom_config.h"
|
||||
#include "winbindd_ntdom.h"
|
||||
#include "winbind_nss_config.h"
|
||||
#include "winbindd_nss.h"
|
||||
|
||||
/* prototypes from common.c */
|
||||
void init_request(struct winbindd_request *req,int rq_type);
|
||||
|
@ -22,8 +22,8 @@
|
||||
Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "ntdom_config.h"
|
||||
#include "winbindd_ntdom.h"
|
||||
#include "winbind_nss_config.h"
|
||||
#include "winbindd_nss.h"
|
||||
|
||||
/* prototypes from common.c */
|
||||
void init_request(struct winbindd_request *req,int rq_type);
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "includes.h"
|
||||
#include "nterr.h"
|
||||
|
||||
#include "winbindd_ntdom.h"
|
||||
#include "winbindd_nss.h"
|
||||
|
||||
/* Naughty global stuff */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user