Index: squid/helpers/basic_auth/winbind/Makefile.am diff -c squid/helpers/basic_auth/winbind/Makefile.am:1.1.2.5 squid/helpers/basic_auth/winbind/Makefile.am:1.1.2.6 *** squid/helpers/basic_auth/winbind/Makefile.am:1.1.2.5 Sun Aug 11 19:13:48 2002 --- squid/helpers/basic_auth/winbind/Makefile.am Tue Feb 11 07:35:14 2003 *************** *** 5,10 **** # libexec_PROGRAMS = wb_auth ! wb_auth_SOURCES = wb_basic_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h ! INCLUDES = -I$(top_srcdir)/include LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) --- 5,10 ---- # libexec_PROGRAMS = wb_auth ! wb_auth_SOURCES = wb_basic_auth.c wb_common.c wbntlm.h ! INCLUDES = -I$(top_srcdir)/include -I@SAMBASOURCES@ LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) Index: squid/helpers/basic_auth/winbind/wb_basic_auth.c diff -c squid/helpers/basic_auth/winbind/wb_basic_auth.c:1.1.2.5 squid/helpers/basic_auth/winbind/wb_basic_auth.c:1.1.2.6 *** squid/helpers/basic_auth/winbind/wb_basic_auth.c:1.1.2.5 Sun Aug 11 19:13:48 2002 --- squid/helpers/basic_auth/winbind/wb_basic_auth.c Tue Feb 11 07:35:14 2003 *************** *** 25,32 **** #include /* for gettimeofday */ #include /* BUG: is this portable? */ ! #include "winbind_nss_config.h" ! #include "winbindd_nss.h" char debug_enabled=0; char *myname; --- 25,32 ---- #include /* for gettimeofday */ #include /* BUG: is this portable? */ ! #include "nsswitch/winbind_nss_config.h" ! #include "nsswitch/winbindd_nss.h" char debug_enabled=0; char *myname; Index: squid/helpers/basic_auth/winbind/wb_common.c diff -c squid/helpers/basic_auth/winbind/wb_common.c:1.1.2.1 squid/helpers/basic_auth/winbind/wb_common.c:1.1.2.2 *** squid/helpers/basic_auth/winbind/wb_common.c:1.1.2.1 Sun May 19 17:45:30 2002 --- squid/helpers/basic_auth/winbind/wb_common.c Tue Feb 11 07:35:14 2003 *************** *** 23,30 **** Boston, MA 02111-1307, USA. */ ! #include "winbind_nss_config.h" ! #include "winbindd_nss.h" #include "config.h" --- 23,30 ---- Boston, MA 02111-1307, USA. */ ! #include "nsswitch/winbind_nss_config.h" ! #include "nsswitch/winbindd_nss.h" #include "config.h" Index: squid/helpers/external_acl/winbind_group/Makefile.am diff -c squid/helpers/external_acl/winbind_group/Makefile.am:1.2.2.2 squid/helpers/external_acl/winbind_group/Makefile.am:1.2.2.3 *** squid/helpers/external_acl/winbind_group/Makefile.am:1.2.2.2 Tue Sep 10 16:34:21 2002 --- squid/helpers/external_acl/winbind_group/Makefile.am Tue Feb 11 07:35:14 2003 *************** *** 5,12 **** # libexec_PROGRAMS = wb_group ! wb_group_SOURCES = wb_check_group.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h EXTRA_DIST = readme.txt INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src LDADD = -L$(top_builddir)/lib $(XTRA_LIBS) --- 5,12 ---- # libexec_PROGRAMS = wb_group ! wb_group_SOURCES = wb_check_group.c wb_common.c wbntlm.h EXTRA_DIST = readme.txt INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src -I@SAMBASOURCES@ LDADD = -L$(top_builddir)/lib $(XTRA_LIBS) Index: squid/helpers/external_acl/winbind_group/wb_check_group.c diff -c squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.6 squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.7 *** squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.6 Sun Nov 17 02:08:21 2002 --- squid/helpers/external_acl/winbind_group/wb_check_group.c Tue Feb 11 07:35:14 2003 *************** *** 38,45 **** #include #include ! #include "winbind_nss_config.h" ! #include "winbindd_nss.h" #define BUFSIZE 8192 /* the stdin buffer size */ char debug_enabled=0; --- 38,45 ---- #include #include ! #include "nsswitch/winbind_nss_config.h" ! #include "nsswitch/winbindd_nss.h" #define BUFSIZE 8192 /* the stdin buffer size */ char debug_enabled=0; Index: squid/helpers/external_acl/winbind_group/wb_common.c diff -c squid/helpers/external_acl/winbind_group/wb_common.c:1.2.2.1 squid/helpers/external_acl/winbind_group/wb_common.c:1.2.2.2 *** squid/helpers/external_acl/winbind_group/wb_common.c:1.2.2.1 Fri Jul 12 02:33:15 2002 --- squid/helpers/external_acl/winbind_group/wb_common.c Tue Feb 11 07:35:14 2003 *************** *** 23,30 **** Boston, MA 02111-1307, USA. */ ! #include "winbind_nss_config.h" ! #include "winbindd_nss.h" #include "config.h" --- 23,30 ---- Boston, MA 02111-1307, USA. */ ! #include "nsswitch/winbind_nss_config.h" ! #include "nsswitch/winbindd_nss.h" #include "config.h" Index: squid/helpers/ntlm_auth/winbind/Makefile.am diff -c squid/helpers/ntlm_auth/winbind/Makefile.am:1.1.2.5 squid/helpers/ntlm_auth/winbind/Makefile.am:1.1.2.6 *** squid/helpers/ntlm_auth/winbind/Makefile.am:1.1.2.5 Thu May 23 08:02:30 2002 --- squid/helpers/ntlm_auth/winbind/Makefile.am Tue Feb 11 07:35:14 2003 *************** *** 5,14 **** # libexec_PROGRAMS = wb_ntlmauth ! wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h EXTRA_DIST = \ patches/wb_common.patch \ patches/winbind_nss_config.patch INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) --- 5,14 ---- # libexec_PROGRAMS = wb_ntlmauth ! wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c wbntlm.h EXTRA_DIST = \ patches/wb_common.patch \ patches/winbind_nss_config.patch INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src -I@SAMBASOURCES@ LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) Index: squid/helpers/ntlm_auth/winbind/wb_common.c diff -c squid/helpers/ntlm_auth/winbind/wb_common.c:1.1.2.1 squid/helpers/ntlm_auth/winbind/wb_common.c:1.1.2.2 *** squid/helpers/ntlm_auth/winbind/wb_common.c:1.1.2.1 Sun May 19 17:45:31 2002 --- squid/helpers/ntlm_auth/winbind/wb_common.c Tue Feb 11 07:35:14 2003 *************** *** 23,30 **** Boston, MA 02111-1307, USA. */ ! #include "winbind_nss_config.h" ! #include "winbindd_nss.h" #include "config.h" --- 23,30 ---- Boston, MA 02111-1307, USA. */ ! #include "nsswitch/winbind_nss_config.h" ! #include "nsswitch/winbindd_nss.h" #include "config.h" Index: squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c diff -c squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.5 squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.6 *** squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.5 Mon Jul 22 05:20:45 2002 --- squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c Tue Feb 11 07:35:14 2003 *************** *** 44,51 **** #include #endif ! #include "winbind_nss_config.h" ! #include "winbindd_nss.h" #ifndef min #define min(x,y) ((x)<(y)?(x):(y)) --- 44,51 ---- #include #endif ! #include "nsswitch/winbind_nss_config.h" ! #include "nsswitch/winbindd_nss.h" #ifndef min #define min(x,y) ((x)<(y)?(x):(y)) Index: squid/include/samba/nsswitch/sys_nss.h diff -c /dev/null squid/include/samba/nsswitch/sys_nss.h:1.1.2.1 *** /dev/null Tue Feb 11 19:07:26 2003 --- squid/include/samba/nsswitch/sys_nss.h Tue Feb 11 07:35:17 2003 *************** *** 0 **** --- 1,104 ---- + #ifndef _NSSWITCH_SYS_NSS_H + #define _NSSWITCH_SYS_NSS_H + /* + Unix SMB/CIFS implementation. + + a common place to work out how to define NSS_STATUS on various + platforms + + Copyright (C) Tim Potter 2000 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + + #ifdef HAVE_NSS_COMMON_H + + /* Sun Solaris */ + + #include + #include + #include + + typedef nss_status_t NSS_STATUS; + + #define NSS_STATUS_SUCCESS NSS_SUCCESS + #define NSS_STATUS_NOTFOUND NSS_NOTFOUND + #define NSS_STATUS_UNAVAIL NSS_UNAVAIL + #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN + + #elif HAVE_NSS_H + + /* GNU */ + + #include + + typedef enum nss_status NSS_STATUS; + + #elif HAVE_NS_API_H + + /* SGI IRIX */ + + /* following required to prevent warnings of double definition + * of datum from ns_api.h + */ + #ifdef DATUM + #define _DATUM_DEFINED + #endif + + #include + + typedef enum + { + NSS_STATUS_SUCCESS=NS_SUCCESS, + NSS_STATUS_NOTFOUND=NS_NOTFOUND, + NSS_STATUS_UNAVAIL=NS_UNAVAIL, + NSS_STATUS_TRYAGAIN=NS_TRYAGAIN + } NSS_STATUS; + + #define NSD_MEM_STATIC 0 + #define NSD_MEM_VOLATILE 1 + #define NSD_MEM_DYNAMIC 2 + + #elif defined(HPUX) && defined(HAVE_NSSWITCH_H) + /* HP-UX 11 */ + + #include "nsswitch/hp_nss_common.h" + #include "nsswitch/hp_nss_dbdefs.h" + #include + + #ifndef _HAVE_TYPEDEF_NSS_STATUS + #define _HAVE_TYPEDEF_NSS_STATUS + typedef nss_status_t NSS_STATUS; + + #define NSS_STATUS_SUCCESS NSS_SUCCESS + #define NSS_STATUS_NOTFOUND NSS_NOTFOUND + #define NSS_STATUS_UNAVAIL NSS_UNAVAIL + #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN + #endif /* HPUX */ + + #else /* Nothing's defined. Neither gnu nor sun nor hp */ + + typedef enum + { + NSS_STATUS_SUCCESS=0, + NSS_STATUS_NOTFOUND=1, + NSS_STATUS_UNAVAIL=2, + NSS_STATUS_TRYAGAIN=3 + } NSS_STATUS; + + #endif + + #endif /* _NSSWITCH_SYS_NSS_H */ Index: squid/include/samba/nsswitch/winbind_nss_config.h diff -c /dev/null squid/include/samba/nsswitch/winbind_nss_config.h:1.1.2.1 *** /dev/null Tue Feb 11 19:07:26 2003 --- squid/include/samba/nsswitch/winbind_nss_config.h Tue Feb 11 07:35:17 2003 *************** *** 0 **** --- 1,155 ---- + /* + Unix SMB/CIFS implementation. + + Winbind daemon for ntdom nss module + + Copyright (C) Tim Potter 2000 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + + #ifndef _WINBIND_NSS_CONFIG_H + #define _WINBIND_NSS_CONFIG_H + + /* Include header files from data in config.h file */ + + #include + + #include + + #ifdef HAVE_STDLIB_H + #include + #endif + + #ifdef HAVE_UNISTD_H + #include + #endif + + #ifdef HAVE_SYS_SELECT_H + #include + #endif + + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + + #ifdef HAVE_UNIXSOCKET + #include + #endif + + #ifdef HAVE_SYS_TIME_H + #include + #endif + + #ifdef HAVE_GRP_H + #include + #endif + + #ifdef HAVE_STRING_H + #include + #endif + + #include + #include + #include + #include + #include "nsswitch/sys_nss.h" + + /* Declarations for functions in winbind_nss.c + needed in winbind_nss_solaris.c (solaris wrapper to nss) */ + + NSS_STATUS _nss_winbind_setpwent(void); + NSS_STATUS _nss_winbind_endpwent(void); + NSS_STATUS _nss_winbind_getpwent_r(struct passwd* result, char* buffer, + size_t buflen, int* errnop); + NSS_STATUS _nss_winbind_getpwuid_r(uid_t, struct passwd*, char* buffer, + size_t buflen, int* errnop); + NSS_STATUS _nss_winbind_getpwnam_r(const char* name, struct passwd* result, + char* buffer, size_t buflen, int* errnop); + + NSS_STATUS _nss_winbind_setgrent(void); + NSS_STATUS _nss_winbind_endgrent(void); + NSS_STATUS _nss_winbind_getgrent_r(struct group* result, char* buffer, + size_t buflen, int* errnop); + NSS_STATUS _nss_winbind_getgrnam_r(const char *name, + struct group *result, char *buffer, + size_t buflen, int *errnop); + NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, + struct group *result, char *buffer, + size_t buflen, int *errnop); + + /* I'm trying really hard not to include anything from smb.h with the + result of some silly looking redeclaration of structures. */ + + #ifndef _PSTRING + #define _PSTRING + #define PSTRING_LEN 1024 + #define FSTRING_LEN 256 + typedef char pstring[PSTRING_LEN]; + typedef char fstring[FSTRING_LEN]; + #endif + + #ifndef _BOOL + #define _BOOL /* So we don't typedef BOOL again in vfs.h */ + #define False (0) + #define True (1) + #define Auto (2) + typedef int BOOL; + #endif + + #if !defined(uint32) + #if (SIZEOF_INT == 4) + #define uint32 unsigned int + #elif (SIZEOF_LONG == 4) + #define uint32 unsigned long + #elif (SIZEOF_SHORT == 4) + #define uint32 unsigned short + #endif + #endif + + #if !defined(uint16) + #if (SIZEOF_SHORT == 4) + #define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; + #else /* SIZEOF_SHORT != 4 */ + #define uint16 unsigned short + #endif /* SIZEOF_SHORT != 4 */ + #endif + + #ifndef uint8 + #define uint8 unsigned char + #endif + + /* zero a structure */ + #ifndef ZERO_STRUCT + #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) + #endif + + /* zero a structure given a pointer to the structure */ + #ifndef ZERO_STRUCTP + #define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } + #endif + + /* Some systems (SCO) treat UNIX domain sockets as FIFOs */ + + #ifndef S_IFSOCK + #define S_IFSOCK S_IFIFO + #endif + + #ifndef S_ISSOCK + #define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) + #endif + + #endif Index: squid/include/samba/nsswitch/winbindd_nss.h diff -c /dev/null squid/include/samba/nsswitch/winbindd_nss.h:1.1.2.1 *** /dev/null Tue Feb 11 19:07:26 2003 --- squid/include/samba/nsswitch/winbindd_nss.h Tue Feb 11 07:35:17 2003 *************** *** 0 **** --- 1,229 ---- + /* + Unix SMB/CIFS implementation. + + Winbind daemon for ntdom nss module + + Copyright (C) Tim Potter 2000 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + + #ifndef SAFE_FREE + #define SAFE_FREE(x) do { if(x) {free(x); x=NULL;} } while(0) + #endif + + #ifndef _WINBINDD_NTDOM_H + #define _WINBINDD_NTDOM_H + + #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ + #define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ + + #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ + #define WINBINDD_DONT_ENV "_NO_WINBINDD" + + /* Update this when you change the interface. */ + + #define WINBIND_INTERFACE_VERSION 4 + + /* Socket commands */ + + enum winbindd_cmd { + + WINBINDD_INTERFACE_VERSION, /* Always a well known value */ + + /* Get users and groups */ + + WINBINDD_GETPWNAM, + WINBINDD_GETPWUID, + WINBINDD_GETGRNAM, + WINBINDD_GETGRGID, + WINBINDD_GETGROUPS, + + /* Enumerate users and groups */ + + WINBINDD_SETPWENT, + WINBINDD_ENDPWENT, + WINBINDD_GETPWENT, + WINBINDD_SETGRENT, + WINBINDD_ENDGRENT, + WINBINDD_GETGRENT, + + /* PAM authenticate and password change */ + + WINBINDD_PAM_AUTH, + WINBINDD_PAM_AUTH_CRAP, + WINBINDD_PAM_CHAUTHTOK, + + /* List various things */ + + WINBINDD_LIST_USERS, /* List w/o rid->id mapping */ + WINBINDD_LIST_GROUPS, /* Ditto */ + WINBINDD_LIST_TRUSTDOM, + + /* SID conversion */ + + WINBINDD_LOOKUPSID, + WINBINDD_LOOKUPNAME, + + /* Lookup functions */ + + WINBINDD_SID_TO_UID, + WINBINDD_SID_TO_GID, + WINBINDD_UID_TO_SID, + WINBINDD_GID_TO_SID, + + /* Miscellaneous other stuff */ + + WINBINDD_CHECK_MACHACC, /* Check machine account pw works */ + WINBINDD_PING, /* Just tell me winbind is running */ + WINBINDD_INFO, /* Various bit of info. Currently just tidbits */ + WINBINDD_DOMAIN_NAME, /* The domain this winbind server is a member of (lp_workgroup()) */ + + WINBINDD_SHOW_SEQUENCE, /* display sequence numbers of domains */ + + /* WINS commands */ + + WINBINDD_WINS_BYIP, + WINBINDD_WINS_BYNAME, + + /* Placeholder for end of cmd list */ + + WINBINDD_NUM_CMDS + }; + + /* Winbind request structure */ + + struct winbindd_request { + uint32 length; + enum winbindd_cmd cmd; /* Winbindd command to execute */ + pid_t pid; /* pid of calling process */ + + union { + fstring winsreq; /* WINS request */ + fstring username; /* getpwnam */ + fstring groupname; /* getgrnam */ + uid_t uid; /* getpwuid, uid_to_sid */ + gid_t gid; /* getgrgid, gid_to_sid */ + struct { + /* We deliberatedly don't split into domain/user to + avoid having the client know what the separator + character is. */ + fstring user; + fstring pass; + } auth; /* pam_winbind auth module */ + struct { + unsigned char chal[8]; + fstring user; + fstring domain; + fstring lm_resp; + uint16 lm_resp_len; + fstring nt_resp; + uint16 nt_resp_len; + } auth_crap; + struct { + fstring user; + fstring oldpass; + fstring newpass; + } chauthtok; /* pam_winbind passwd module */ + fstring sid; /* lookupsid, sid_to_[ug]id */ + struct { + fstring dom_name; /* lookupname */ + fstring name; + } name; + uint32 num_entries; /* getpwent, getgrent */ + } data; + fstring domain; /* {set,get,end}{pw,gr}ent() */ + }; + + /* Response values */ + + enum winbindd_result { + WINBINDD_ERROR, + WINBINDD_OK + }; + + /* Winbind response structure */ + + struct winbindd_response { + + /* Header information */ + + uint32 length; /* Length of response */ + enum winbindd_result result; /* Result code */ + + /* Fixed length return data */ + + union { + int interface_version; /* Try to ensure this is always in the same spot... */ + + fstring winsresp; /* WINS response */ + + /* getpwnam, getpwuid */ + + struct winbindd_pw { + fstring pw_name; + fstring pw_passwd; + uid_t pw_uid; + gid_t pw_gid; + fstring pw_gecos; + fstring pw_dir; + fstring pw_shell; + } pw; + + /* getgrnam, getgrgid */ + + struct winbindd_gr { + fstring gr_name; + fstring gr_passwd; + gid_t gr_gid; + int num_gr_mem; + int gr_mem_ofs; /* offset to group membership */ + } gr; + + uint32 num_entries; /* getpwent, getgrent */ + struct winbindd_sid { + fstring sid; /* lookupname, [ug]id_to_sid */ + int type; + } sid; + struct winbindd_name { + fstring dom_name; /* lookupsid */ + fstring name; + int type; + } name; + uid_t uid; /* sid_to_uid */ + gid_t gid; /* sid_to_gid */ + struct winbindd_info { + char winbind_separator; + fstring samba_version; + } info; + fstring domain_name; + + struct auth_reply { + uint32 nt_status; + fstring nt_status_string; + fstring error_string; + int pam_error; + } auth; + } data; + + uint32 nt_status; /* Extended error information */ + + /* Variable length return data */ + + void *extra_data; /* getgrnam, getgrgid, getgrent */ + }; + + #endif Index: squid/helpers/basic_auth/winbind/samba_nss.h diff -c squid/helpers/basic_auth/winbind/samba_nss.h:1.1.2.1 squid/helpers/basic_auth/winbind/samba_nss.h:removed *** squid/helpers/basic_auth/winbind/samba_nss.h:1.1.2.1 Sun May 19 17:45:29 2002 --- squid/helpers/basic_auth/winbind/samba_nss.h Tue Feb 11 19:07:26 2003 *************** *** 1,105 **** - #ifndef _NSSWITCH_NSS_H - #define _NSSWITCH_NSS_H - /* - Unix SMB/Netbios implementation. - Version 2.0 - - a common place to work out how to define NSS_STATUS on various - platforms - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifdef HAVE_NSS_COMMON_H - - /* Sun Solaris */ - - #include - #include - #include - - typedef nss_status_t NSS_STATUS; - - #define NSS_STATUS_SUCCESS NSS_SUCCESS - #define NSS_STATUS_NOTFOUND NSS_NOTFOUND - #define NSS_STATUS_UNAVAIL NSS_UNAVAIL - #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - - #elif HAVE_NSS_H - - /* GNU */ - - #include - - typedef enum nss_status NSS_STATUS; - - #elif HAVE_NS_API_H - - /* SGI IRIX */ - - /* following required to prevent warnings of double definition - * of datum from ns_api.h - */ - #ifdef DATUM - #define _DATUM_DEFINED - #endif - - #include - - typedef enum - { - NSS_STATUS_SUCCESS=NS_SUCCESS, - NSS_STATUS_NOTFOUND=NS_NOTFOUND, - NSS_STATUS_UNAVAIL=NS_UNAVAIL, - NSS_STATUS_TRYAGAIN=NS_TRYAGAIN - } NSS_STATUS; - - #define NSD_MEM_STATIC 0 - #define NSD_MEM_VOLATILE 1 - #define NSD_MEM_DYNAMIC 2 - - #elif defined(HPUX) - /* HP-UX 11 */ - - #include "nsswitch/hp_nss_common.h" - #include "nsswitch/hp_nss_dbdefs.h" - #include - - #ifndef _HAVE_TYPEDEF_NSS_STATUS - #define _HAVE_TYPEDEF_NSS_STATUS - typedef nss_status_t NSS_STATUS; - - #define NSS_STATUS_SUCCESS NSS_SUCCESS - #define NSS_STATUS_NOTFOUND NSS_NOTFOUND - #define NSS_STATUS_UNAVAIL NSS_UNAVAIL - #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - #endif /* HPUX */ - - #else /* Nothing's defined. Neither gnu nor sun nor hp */ - - typedef enum - { - NSS_STATUS_SUCCESS=0, - NSS_STATUS_NOTFOUND=1, - NSS_STATUS_UNAVAIL=2, - NSS_STATUS_TRYAGAIN=3 - } NSS_STATUS; - - #endif - - #endif /* _NSSWITCH_NSS_H */ --- 0 ---- Index: squid/helpers/basic_auth/winbind/winbind_nss_config.h diff -c squid/helpers/basic_auth/winbind/winbind_nss_config.h:1.1.2.1 squid/helpers/basic_auth/winbind/winbind_nss_config.h:removed *** squid/helpers/basic_auth/winbind/winbind_nss_config.h:1.1.2.1 Sun May 19 17:45:30 2002 --- squid/helpers/basic_auth/winbind/winbind_nss_config.h Tue Feb 11 19:07:26 2003 *************** *** 1,148 **** - /* - Unix SMB/Netbios implementation. - Version 2.0 - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifndef _WINBIND_NSS_CONFIG_H - #define _WINBIND_NSS_CONFIG_H - - /* Include header files from data in config.h file */ - - #include "config.h" - - #include - - #ifdef HAVE_STDLIB_H - #include - #endif - - #ifdef HAVE_UNISTD_H - #include - #endif - - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - - #ifdef HAVE_UNIXSOCKET - #include - #endif - - #ifdef HAVE_SYS_TIME_H - #include - #endif - - #ifdef HAVE_GRP_H - #include - #endif - - #ifdef HAVE_STRING_H - #include - #endif - - #include - #include - #include - #include - #include "samba_nss.h" - - /* Declarations for functions in winbind_nss.c - needed in winbind_nss_solaris.c (solaris wrapper to nss) */ - - NSS_STATUS _nss_winbind_setpwent(void); - NSS_STATUS _nss_winbind_endpwent(void); - NSS_STATUS _nss_winbind_getpwent_r(struct passwd* result, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getpwuid_r(uid_t, struct passwd*, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getpwnam_r(const char* name, struct passwd* result, - char* buffer, size_t buflen, int* errnop); - - NSS_STATUS _nss_winbind_setgrent(void); - NSS_STATUS _nss_winbind_endgrent(void); - NSS_STATUS _nss_winbind_getgrent_r(struct group* result, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getgrnam_r(const char *name, - struct group *result, char *buffer, - size_t buflen, int *errnop); - NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, - struct group *result, char *buffer, - size_t buflen, int *errnop); - - /* I'm trying really hard not to include anything from smb.h with the - result of some silly looking redeclaration of structures. */ - - #ifndef _PSTRING - #define _PSTRING - #define PSTRING_LEN 1024 - #define FSTRING_LEN 256 - typedef char pstring[PSTRING_LEN]; - typedef char fstring[FSTRING_LEN]; - #endif - - #ifndef _BOOL - #define _BOOL /* So we don't typedef BOOL again in vfs.h */ - #define False (0) - #define True (1) - #define Auto (2) - typedef int BOOL; - #endif - - #if !defined(uint32) - #if (SIZEOF_INT == 4) - #define uint32 unsigned int - #elif (SIZEOF_LONG == 4) - #define uint32 unsigned long - #elif (SIZEOF_SHORT == 4) - #define uint32 unsigned short - #endif - #endif - - #if !defined(uint16) - #if (SIZEOF_SHORT == 4) - #define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; - #else /* SIZEOF_SHORT != 4 */ - #define uint16 unsigned short - #endif /* SIZEOF_SHORT != 4 */ - #endif - - #ifndef uint8 - #define uint8 unsigned char - #endif - - /* zero a structure */ - #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) - - /* zero a structure given a pointer to the structure */ - #define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } - - /* Some systems (SCO) treat UNIX domain sockets as FIFOs */ - - #ifndef S_IFSOCK - #define S_IFSOCK S_IFIFO - #endif - - #ifndef S_ISSOCK - #define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) - #endif - - #endif --- 0 ---- Index: squid/helpers/basic_auth/winbind/winbindd_nss.h diff -c squid/helpers/basic_auth/winbind/winbindd_nss.h:1.1.2.1 squid/helpers/basic_auth/winbind/winbindd_nss.h:removed *** squid/helpers/basic_auth/winbind/winbindd_nss.h:1.1.2.1 Sun May 19 17:45:30 2002 --- squid/helpers/basic_auth/winbind/winbindd_nss.h Tue Feb 11 19:07:26 2003 *************** *** 1,202 **** - /* - Unix SMB/Netbios implementation. - Version 2.0 - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifndef SAFE_FREE - #define SAFE_FREE(x) do { if(x) {free(x); x=NULL;} } while(0) - #endif - - #ifndef _WINBINDD_NTDOM_H - #define _WINBINDD_NTDOM_H - - #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ - #define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ - - #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ - #define WINBINDD_DONT_ENV "_NO_WINBINDD" - - /* Update this when you change the interface. */ - - #define WINBIND_INTERFACE_VERSION 2 - - /* Socket commands */ - - enum winbindd_cmd { - - WINBINDD_INTERFACE_VERSION, /* Always a well known value */ - - /* Get users and groups */ - - WINBINDD_GETPWNAM, - WINBINDD_GETPWUID, - WINBINDD_GETGRNAM, - WINBINDD_GETGRGID, - WINBINDD_GETGROUPS, - - /* Enumerate users and groups */ - - WINBINDD_SETPWENT, - WINBINDD_ENDPWENT, - WINBINDD_GETPWENT, - WINBINDD_SETGRENT, - WINBINDD_ENDGRENT, - WINBINDD_GETGRENT, - - /* PAM authenticate and password change */ - - WINBINDD_PAM_AUTH, - WINBINDD_PAM_AUTH_CRAP, - WINBINDD_PAM_CHAUTHTOK, - - /* List various things */ - - WINBINDD_LIST_USERS, /* List w/o rid->id mapping */ - WINBINDD_LIST_GROUPS, /* Ditto */ - WINBINDD_LIST_TRUSTDOM, - - /* SID conversion */ - - WINBINDD_LOOKUPSID, - WINBINDD_LOOKUPNAME, - - /* Lookup functions */ - - WINBINDD_SID_TO_UID, - WINBINDD_SID_TO_GID, - WINBINDD_UID_TO_SID, - WINBINDD_GID_TO_SID, - - /* Miscellaneous other stuff */ - - WINBINDD_CHECK_MACHACC, /* Check machine account pw works */ - WINBINDD_PING, /* Just tell me winbind is running */ - WINBINDD_INFO, /* Various bit of info. Currently just tidbits */ - - /* Placeholder for end of cmd list */ - - WINBINDD_NUM_CMDS - }; - - /* Winbind request structure */ - - struct winbindd_request { - uint32 length; - enum winbindd_cmd cmd; /* Winbindd command to execute */ - pid_t pid; /* pid of calling process */ - - union { - fstring username; /* getpwnam */ - fstring groupname; /* getgrnam */ - uid_t uid; /* getpwuid, uid_to_sid */ - gid_t gid; /* getgrgid, gid_to_sid */ - struct { - fstring user; - fstring pass; - } auth; /* pam_winbind auth module */ - struct { - unsigned char chal[8]; - fstring user; - fstring domain; - fstring lm_resp; - uint16 lm_resp_len; - fstring nt_resp; - uint16 nt_resp_len; - } auth_crap; - struct { - fstring user; - fstring oldpass; - fstring newpass; - } chauthtok; /* pam_winbind passwd module */ - fstring sid; /* lookupsid, sid_to_[ug]id */ - fstring name; /* lookupname */ - uint32 num_entries; /* getpwent, getgrent */ - } data; - fstring domain; /* {set,get,end}{pw,gr}ent() */ - }; - - /* Response values */ - - enum winbindd_result { - WINBINDD_ERROR, - WINBINDD_OK - }; - - /* Winbind response structure */ - - struct winbindd_response { - - /* Header information */ - - uint32 length; /* Length of response */ - enum winbindd_result result; /* Result code */ - - /* Fixed length return data */ - - union { - int interface_version; /* Try to ensure this is always in the same spot... */ - - /* getpwnam, getpwuid */ - - struct winbindd_pw { - fstring pw_name; - fstring pw_passwd; - uid_t pw_uid; - gid_t pw_gid; - fstring pw_gecos; - fstring pw_dir; - fstring pw_shell; - } pw; - - /* getgrnam, getgrgid */ - - struct winbindd_gr { - fstring gr_name; - fstring gr_passwd; - gid_t gr_gid; - int num_gr_mem; - int gr_mem_ofs; /* offset to group membership */ - } gr; - - uint32 num_entries; /* getpwent, getgrent */ - struct winbindd_sid { - fstring sid; /* lookupname, [ug]id_to_sid */ - int type; - } sid; - struct winbindd_name { - fstring name; /* lookupsid */ - int type; - } name; - uid_t uid; /* sid_to_uid */ - gid_t gid; /* sid_to_gid */ - struct winbindd_info { - char winbind_separator; - fstring samba_version; - } info; - } data; - - /* Variable length return data */ - - void *extra_data; /* getgrnam, getgrgid, getgrent */ - }; - - #endif --- 0 ---- Index: squid/helpers/external_acl/winbind_group/samba_nss.h diff -c squid/helpers/external_acl/winbind_group/samba_nss.h:1.2.2.1 squid/helpers/external_acl/winbind_group/samba_nss.h:removed *** squid/helpers/external_acl/winbind_group/samba_nss.h:1.2.2.1 Fri Jul 12 02:33:15 2002 --- squid/helpers/external_acl/winbind_group/samba_nss.h Tue Feb 11 19:07:26 2003 *************** *** 1,105 **** - #ifndef _NSSWITCH_NSS_H - #define _NSSWITCH_NSS_H - /* - Unix SMB/Netbios implementation. - Version 2.0 - - a common place to work out how to define NSS_STATUS on various - platforms - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifdef HAVE_NSS_COMMON_H - - /* Sun Solaris */ - - #include - #include - #include - - typedef nss_status_t NSS_STATUS; - - #define NSS_STATUS_SUCCESS NSS_SUCCESS - #define NSS_STATUS_NOTFOUND NSS_NOTFOUND - #define NSS_STATUS_UNAVAIL NSS_UNAVAIL - #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - - #elif HAVE_NSS_H - - /* GNU */ - - #include - - typedef enum nss_status NSS_STATUS; - - #elif HAVE_NS_API_H - - /* SGI IRIX */ - - /* following required to prevent warnings of double definition - * of datum from ns_api.h - */ - #ifdef DATUM - #define _DATUM_DEFINED - #endif - - #include - - typedef enum - { - NSS_STATUS_SUCCESS=NS_SUCCESS, - NSS_STATUS_NOTFOUND=NS_NOTFOUND, - NSS_STATUS_UNAVAIL=NS_UNAVAIL, - NSS_STATUS_TRYAGAIN=NS_TRYAGAIN - } NSS_STATUS; - - #define NSD_MEM_STATIC 0 - #define NSD_MEM_VOLATILE 1 - #define NSD_MEM_DYNAMIC 2 - - #elif defined(HPUX) - /* HP-UX 11 */ - - #include "nsswitch/hp_nss_common.h" - #include "nsswitch/hp_nss_dbdefs.h" - #include - - #ifndef _HAVE_TYPEDEF_NSS_STATUS - #define _HAVE_TYPEDEF_NSS_STATUS - typedef nss_status_t NSS_STATUS; - - #define NSS_STATUS_SUCCESS NSS_SUCCESS - #define NSS_STATUS_NOTFOUND NSS_NOTFOUND - #define NSS_STATUS_UNAVAIL NSS_UNAVAIL - #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - #endif /* HPUX */ - - #else /* Nothing's defined. Neither gnu nor sun nor hp */ - - typedef enum - { - NSS_STATUS_SUCCESS=0, - NSS_STATUS_NOTFOUND=1, - NSS_STATUS_UNAVAIL=2, - NSS_STATUS_TRYAGAIN=3 - } NSS_STATUS; - - #endif - - #endif /* _NSSWITCH_NSS_H */ --- 0 ---- Index: squid/helpers/external_acl/winbind_group/winbind_nss_config.h diff -c squid/helpers/external_acl/winbind_group/winbind_nss_config.h:1.2.2.1 squid/helpers/external_acl/winbind_group/winbind_nss_config.h:removed *** squid/helpers/external_acl/winbind_group/winbind_nss_config.h:1.2.2.1 Fri Jul 12 02:33:15 2002 --- squid/helpers/external_acl/winbind_group/winbind_nss_config.h Tue Feb 11 19:07:26 2003 *************** *** 1,148 **** - /* - Unix SMB/Netbios implementation. - Version 2.0 - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifndef _WINBIND_NSS_CONFIG_H - #define _WINBIND_NSS_CONFIG_H - - /* Include header files from data in config.h file */ - - #include "config.h" - - #include - - #ifdef HAVE_STDLIB_H - #include - #endif - - #ifdef HAVE_UNISTD_H - #include - #endif - - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - - #ifdef HAVE_UNIXSOCKET - #include - #endif - - #ifdef HAVE_SYS_TIME_H - #include - #endif - - #ifdef HAVE_GRP_H - #include - #endif - - #ifdef HAVE_STRING_H - #include - #endif - - #include - #include - #include - #include - #include "samba_nss.h" - - /* Declarations for functions in winbind_nss.c - needed in winbind_nss_solaris.c (solaris wrapper to nss) */ - - NSS_STATUS _nss_winbind_setpwent(void); - NSS_STATUS _nss_winbind_endpwent(void); - NSS_STATUS _nss_winbind_getpwent_r(struct passwd* result, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getpwuid_r(uid_t, struct passwd*, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getpwnam_r(const char* name, struct passwd* result, - char* buffer, size_t buflen, int* errnop); - - NSS_STATUS _nss_winbind_setgrent(void); - NSS_STATUS _nss_winbind_endgrent(void); - NSS_STATUS _nss_winbind_getgrent_r(struct group* result, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getgrnam_r(const char *name, - struct group *result, char *buffer, - size_t buflen, int *errnop); - NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, - struct group *result, char *buffer, - size_t buflen, int *errnop); - - /* I'm trying really hard not to include anything from smb.h with the - result of some silly looking redeclaration of structures. */ - - #ifndef _PSTRING - #define _PSTRING - #define PSTRING_LEN 1024 - #define FSTRING_LEN 256 - typedef char pstring[PSTRING_LEN]; - typedef char fstring[FSTRING_LEN]; - #endif - - #ifndef _BOOL - #define _BOOL /* So we don't typedef BOOL again in vfs.h */ - #define False (0) - #define True (1) - #define Auto (2) - typedef int BOOL; - #endif - - #if !defined(uint32) - #if (SIZEOF_INT == 4) - #define uint32 unsigned int - #elif (SIZEOF_LONG == 4) - #define uint32 unsigned long - #elif (SIZEOF_SHORT == 4) - #define uint32 unsigned short - #endif - #endif - - #if !defined(uint16) - #if (SIZEOF_SHORT == 4) - #define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; - #else /* SIZEOF_SHORT != 4 */ - #define uint16 unsigned short - #endif /* SIZEOF_SHORT != 4 */ - #endif - - #ifndef uint8 - #define uint8 unsigned char - #endif - - /* zero a structure */ - #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) - - /* zero a structure given a pointer to the structure */ - #define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } - - /* Some systems (SCO) treat UNIX domain sockets as FIFOs */ - - #ifndef S_IFSOCK - #define S_IFSOCK S_IFIFO - #endif - - #ifndef S_ISSOCK - #define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) - #endif - - #endif --- 0 ---- Index: squid/helpers/external_acl/winbind_group/winbindd_nss.h diff -c squid/helpers/external_acl/winbind_group/winbindd_nss.h:1.1.2.1 squid/helpers/external_acl/winbind_group/winbindd_nss.h:removed *** squid/helpers/external_acl/winbind_group/winbindd_nss.h:1.1.2.1 Fri Jul 12 02:33:15 2002 --- squid/helpers/external_acl/winbind_group/winbindd_nss.h Tue Feb 11 19:07:26 2003 *************** *** 1,224 **** - /* - Unix SMB/CIFS implementation. - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifndef SAFE_FREE - #define SAFE_FREE(x) do { if(x) {free(x); x=NULL;} } while(0) - #endif - - #ifndef _WINBINDD_NTDOM_H - #define _WINBINDD_NTDOM_H - - #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ - #define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ - - #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ - #define WINBINDD_DONT_ENV "_NO_WINBINDD" - - /* Update this when you change the interface. */ - - #define WINBIND_INTERFACE_VERSION 4 - - /* Socket commands */ - - enum winbindd_cmd { - - WINBINDD_INTERFACE_VERSION, /* Always a well known value */ - - /* Get users and groups */ - - WINBINDD_GETPWNAM, - WINBINDD_GETPWUID, - WINBINDD_GETGRNAM, - WINBINDD_GETGRGID, - WINBINDD_GETGROUPS, - - /* Enumerate users and groups */ - - WINBINDD_SETPWENT, - WINBINDD_ENDPWENT, - WINBINDD_GETPWENT, - WINBINDD_SETGRENT, - WINBINDD_ENDGRENT, - WINBINDD_GETGRENT, - - /* PAM authenticate and password change */ - - WINBINDD_PAM_AUTH, - WINBINDD_PAM_AUTH_CRAP, - WINBINDD_PAM_CHAUTHTOK, - - /* List various things */ - - WINBINDD_LIST_USERS, /* List w/o rid->id mapping */ - WINBINDD_LIST_GROUPS, /* Ditto */ - WINBINDD_LIST_TRUSTDOM, - - /* SID conversion */ - - WINBINDD_LOOKUPSID, - WINBINDD_LOOKUPNAME, - - /* Lookup functions */ - - WINBINDD_SID_TO_UID, - WINBINDD_SID_TO_GID, - WINBINDD_UID_TO_SID, - WINBINDD_GID_TO_SID, - - /* Miscellaneous other stuff */ - - WINBINDD_CHECK_MACHACC, /* Check machine account pw works */ - WINBINDD_PING, /* Just tell me winbind is running */ - WINBINDD_INFO, /* Various bit of info. Currently just tidbits */ - WINBINDD_DOMAIN_NAME, /* The domain this winbind server is a member of (lp_workgroup()) */ - - WINBINDD_SHOW_SEQUENCE, /* display sequence numbers of domains */ - - /* WINS commands */ - - WINBINDD_WINS_BYIP, - WINBINDD_WINS_BYNAME, - - /* Placeholder for end of cmd list */ - - WINBINDD_NUM_CMDS - }; - - /* Winbind request structure */ - - struct winbindd_request { - uint32 length; - enum winbindd_cmd cmd; /* Winbindd command to execute */ - pid_t pid; /* pid of calling process */ - - union { - fstring winsreq; /* WINS request */ - fstring username; /* getpwnam */ - fstring groupname; /* getgrnam */ - uid_t uid; /* getpwuid, uid_to_sid */ - gid_t gid; /* getgrgid, gid_to_sid */ - struct { - fstring user; - fstring pass; - } auth; /* pam_winbind auth module */ - struct { - unsigned char chal[8]; - fstring user; - fstring domain; - fstring lm_resp; - uint16 lm_resp_len; - fstring nt_resp; - uint16 nt_resp_len; - } auth_crap; - struct { - fstring user; - fstring oldpass; - fstring newpass; - } chauthtok; /* pam_winbind passwd module */ - fstring sid; /* lookupsid, sid_to_[ug]id */ - struct { - fstring dom_name; /* lookupname */ - fstring name; - } name; - uint32 num_entries; /* getpwent, getgrent */ - } data; - fstring domain; /* {set,get,end}{pw,gr}ent() */ - }; - - /* Response values */ - - enum winbindd_result { - WINBINDD_ERROR, - WINBINDD_OK - }; - - /* Winbind response structure */ - - struct winbindd_response { - - /* Header information */ - - uint32 length; /* Length of response */ - enum winbindd_result result; /* Result code */ - - /* Fixed length return data */ - - union { - int interface_version; /* Try to ensure this is always in the same spot... */ - - fstring winsresp; /* WINS response */ - - /* getpwnam, getpwuid */ - - struct winbindd_pw { - fstring pw_name; - fstring pw_passwd; - uid_t pw_uid; - gid_t pw_gid; - fstring pw_gecos; - fstring pw_dir; - fstring pw_shell; - } pw; - - /* getgrnam, getgrgid */ - - struct winbindd_gr { - fstring gr_name; - fstring gr_passwd; - gid_t gr_gid; - int num_gr_mem; - int gr_mem_ofs; /* offset to group membership */ - } gr; - - uint32 num_entries; /* getpwent, getgrent */ - struct winbindd_sid { - fstring sid; /* lookupname, [ug]id_to_sid */ - int type; - } sid; - struct winbindd_name { - fstring dom_name; /* lookupsid */ - fstring name; - int type; - } name; - uid_t uid; /* sid_to_uid */ - gid_t gid; /* sid_to_gid */ - struct winbindd_info { - char winbind_separator; - fstring samba_version; - } info; - fstring domain_name; - - struct auth_reply { - uint32 nt_status; - fstring nt_status_string; - fstring error_string; - int pam_error; - } auth; - } data; - - /* Variable length return data */ - - void *extra_data; /* getgrnam, getgrgid, getgrent */ - }; - - #endif --- 0 ---- Index: squid/helpers/ntlm_auth/winbind/samba_nss.h diff -c squid/helpers/ntlm_auth/winbind/samba_nss.h:1.1.2.1 squid/helpers/ntlm_auth/winbind/samba_nss.h:removed *** squid/helpers/ntlm_auth/winbind/samba_nss.h:1.1.2.1 Sun May 19 17:45:31 2002 --- squid/helpers/ntlm_auth/winbind/samba_nss.h Tue Feb 11 19:07:26 2003 *************** *** 1,105 **** - #ifndef _NSSWITCH_NSS_H - #define _NSSWITCH_NSS_H - /* - Unix SMB/Netbios implementation. - Version 2.0 - - a common place to work out how to define NSS_STATUS on various - platforms - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifdef HAVE_NSS_COMMON_H - - /* Sun Solaris */ - - #include - #include - #include - - typedef nss_status_t NSS_STATUS; - - #define NSS_STATUS_SUCCESS NSS_SUCCESS - #define NSS_STATUS_NOTFOUND NSS_NOTFOUND - #define NSS_STATUS_UNAVAIL NSS_UNAVAIL - #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - - #elif HAVE_NSS_H - - /* GNU */ - - #include - - typedef enum nss_status NSS_STATUS; - - #elif HAVE_NS_API_H - - /* SGI IRIX */ - - /* following required to prevent warnings of double definition - * of datum from ns_api.h - */ - #ifdef DATUM - #define _DATUM_DEFINED - #endif - - #include - - typedef enum - { - NSS_STATUS_SUCCESS=NS_SUCCESS, - NSS_STATUS_NOTFOUND=NS_NOTFOUND, - NSS_STATUS_UNAVAIL=NS_UNAVAIL, - NSS_STATUS_TRYAGAIN=NS_TRYAGAIN - } NSS_STATUS; - - #define NSD_MEM_STATIC 0 - #define NSD_MEM_VOLATILE 1 - #define NSD_MEM_DYNAMIC 2 - - #elif defined(HPUX) - /* HP-UX 11 */ - - #include "nsswitch/hp_nss_common.h" - #include "nsswitch/hp_nss_dbdefs.h" - #include - - #ifndef _HAVE_TYPEDEF_NSS_STATUS - #define _HAVE_TYPEDEF_NSS_STATUS - typedef nss_status_t NSS_STATUS; - - #define NSS_STATUS_SUCCESS NSS_SUCCESS - #define NSS_STATUS_NOTFOUND NSS_NOTFOUND - #define NSS_STATUS_UNAVAIL NSS_UNAVAIL - #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - #endif /* HPUX */ - - #else /* Nothing's defined. Neither gnu nor sun nor hp */ - - typedef enum - { - NSS_STATUS_SUCCESS=0, - NSS_STATUS_NOTFOUND=1, - NSS_STATUS_UNAVAIL=2, - NSS_STATUS_TRYAGAIN=3 - } NSS_STATUS; - - #endif - - #endif /* _NSSWITCH_NSS_H */ --- 0 ---- Index: squid/helpers/ntlm_auth/winbind/winbind_nss_config.h diff -c squid/helpers/ntlm_auth/winbind/winbind_nss_config.h:1.1.2.1 squid/helpers/ntlm_auth/winbind/winbind_nss_config.h:removed *** squid/helpers/ntlm_auth/winbind/winbind_nss_config.h:1.1.2.1 Sun May 19 17:45:31 2002 --- squid/helpers/ntlm_auth/winbind/winbind_nss_config.h Tue Feb 11 19:07:26 2003 *************** *** 1,148 **** - /* - Unix SMB/Netbios implementation. - Version 2.0 - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifndef _WINBIND_NSS_CONFIG_H - #define _WINBIND_NSS_CONFIG_H - - /* Include header files from data in config.h file */ - - #include "config.h" - - #include - - #ifdef HAVE_STDLIB_H - #include - #endif - - #ifdef HAVE_UNISTD_H - #include - #endif - - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - - #ifdef HAVE_UNIXSOCKET - #include - #endif - - #ifdef HAVE_SYS_TIME_H - #include - #endif - - #ifdef HAVE_GRP_H - #include - #endif - - #ifdef HAVE_STRING_H - #include - #endif - - #include - #include - #include - #include - #include "samba_nss.h" - - /* Declarations for functions in winbind_nss.c - needed in winbind_nss_solaris.c (solaris wrapper to nss) */ - - NSS_STATUS _nss_winbind_setpwent(void); - NSS_STATUS _nss_winbind_endpwent(void); - NSS_STATUS _nss_winbind_getpwent_r(struct passwd* result, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getpwuid_r(uid_t, struct passwd*, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getpwnam_r(const char* name, struct passwd* result, - char* buffer, size_t buflen, int* errnop); - - NSS_STATUS _nss_winbind_setgrent(void); - NSS_STATUS _nss_winbind_endgrent(void); - NSS_STATUS _nss_winbind_getgrent_r(struct group* result, char* buffer, - size_t buflen, int* errnop); - NSS_STATUS _nss_winbind_getgrnam_r(const char *name, - struct group *result, char *buffer, - size_t buflen, int *errnop); - NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, - struct group *result, char *buffer, - size_t buflen, int *errnop); - - /* I'm trying really hard not to include anything from smb.h with the - result of some silly looking redeclaration of structures. */ - - #ifndef _PSTRING - #define _PSTRING - #define PSTRING_LEN 1024 - #define FSTRING_LEN 256 - typedef char pstring[PSTRING_LEN]; - typedef char fstring[FSTRING_LEN]; - #endif - - #ifndef _BOOL - #define _BOOL /* So we don't typedef BOOL again in vfs.h */ - #define False (0) - #define True (1) - #define Auto (2) - typedef int BOOL; - #endif - - #if !defined(uint32) - #if (SIZEOF_INT == 4) - #define uint32 unsigned int - #elif (SIZEOF_LONG == 4) - #define uint32 unsigned long - #elif (SIZEOF_SHORT == 4) - #define uint32 unsigned short - #endif - #endif - - #if !defined(uint16) - #if (SIZEOF_SHORT == 4) - #define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; - #else /* SIZEOF_SHORT != 4 */ - #define uint16 unsigned short - #endif /* SIZEOF_SHORT != 4 */ - #endif - - #ifndef uint8 - #define uint8 unsigned char - #endif - - /* zero a structure */ - #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) - - /* zero a structure given a pointer to the structure */ - #define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } - - /* Some systems (SCO) treat UNIX domain sockets as FIFOs */ - - #ifndef S_IFSOCK - #define S_IFSOCK S_IFIFO - #endif - - #ifndef S_ISSOCK - #define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) - #endif - - #endif --- 0 ---- Index: squid/helpers/ntlm_auth/winbind/winbindd_nss.h diff -c squid/helpers/ntlm_auth/winbind/winbindd_nss.h:1.1.2.1 squid/helpers/ntlm_auth/winbind/winbindd_nss.h:removed *** squid/helpers/ntlm_auth/winbind/winbindd_nss.h:1.1.2.1 Sun May 19 17:45:31 2002 --- squid/helpers/ntlm_auth/winbind/winbindd_nss.h Tue Feb 11 19:07:26 2003 *************** *** 1,216 **** - /* - Unix SMB/CIFS implementation. - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - - #ifndef SAFE_FREE - #define SAFE_FREE(x) do { if(x) {free(x); x=NULL;} } while(0) - #endif - - #ifndef _WINBINDD_NTDOM_H - #define _WINBINDD_NTDOM_H - - #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ - #define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ - - #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ - #define WINBINDD_DONT_ENV "_NO_WINBINDD" - - /* Update this when you change the interface. */ - - #define WINBIND_INTERFACE_VERSION 4 - - /* Socket commands */ - - enum winbindd_cmd { - - WINBINDD_INTERFACE_VERSION, /* Always a well known value */ - - /* Get users and groups */ - - WINBINDD_GETPWNAM, - WINBINDD_GETPWUID, - WINBINDD_GETGRNAM, - WINBINDD_GETGRGID, - WINBINDD_GETGROUPS, - - /* Enumerate users and groups */ - - WINBINDD_SETPWENT, - WINBINDD_ENDPWENT, - WINBINDD_GETPWENT, - WINBINDD_SETGRENT, - WINBINDD_ENDGRENT, - WINBINDD_GETGRENT, - - /* PAM authenticate and password change */ - - WINBINDD_PAM_AUTH, - WINBINDD_PAM_AUTH_CRAP, - WINBINDD_PAM_CHAUTHTOK, - - /* List various things */ - - WINBINDD_LIST_USERS, /* List w/o rid->id mapping */ - WINBINDD_LIST_GROUPS, /* Ditto */ - WINBINDD_LIST_TRUSTDOM, - - /* SID conversion */ - - WINBINDD_LOOKUPSID, - WINBINDD_LOOKUPNAME, - - /* Lookup functions */ - - WINBINDD_SID_TO_UID, - WINBINDD_SID_TO_GID, - WINBINDD_UID_TO_SID, - WINBINDD_GID_TO_SID, - - /* Miscellaneous other stuff */ - - WINBINDD_CHECK_MACHACC, /* Check machine account pw works */ - WINBINDD_PING, /* Just tell me winbind is running */ - WINBINDD_INFO, /* Various bit of info. Currently just tidbits */ - WINBINDD_DOMAIN_NAME, /* The domain this winbind server is a member of (lp_workgroup()) */ - - WINBINDD_SHOW_SEQUENCE, /* display sequence numbers of domains */ - - /* Placeholder for end of cmd list */ - - WINBINDD_NUM_CMDS - }; - - /* Winbind request structure */ - - struct winbindd_request { - uint32 length; - enum winbindd_cmd cmd; /* Winbindd command to execute */ - pid_t pid; /* pid of calling process */ - - union { - fstring username; /* getpwnam */ - fstring groupname; /* getgrnam */ - uid_t uid; /* getpwuid, uid_to_sid */ - gid_t gid; /* getgrgid, gid_to_sid */ - struct { - fstring user; - fstring pass; - } auth; /* pam_winbind auth module */ - struct { - unsigned char chal[8]; - fstring user; - fstring domain; - fstring lm_resp; - uint16 lm_resp_len; - fstring nt_resp; - uint16 nt_resp_len; - } auth_crap; - struct { - fstring user; - fstring oldpass; - fstring newpass; - } chauthtok; /* pam_winbind passwd module */ - fstring sid; /* lookupsid, sid_to_[ug]id */ - struct { - fstring dom_name; /* lookupname */ - fstring name; - } name; - uint32 num_entries; /* getpwent, getgrent */ - } data; - fstring domain; /* {set,get,end}{pw,gr}ent() */ - }; - - /* Response values */ - - enum winbindd_result { - WINBINDD_ERROR, - WINBINDD_OK - }; - - /* Winbind response structure */ - - struct winbindd_response { - - /* Header information */ - - uint32 length; /* Length of response */ - enum winbindd_result result; /* Result code */ - - /* Fixed length return data */ - - union { - int interface_version; /* Try to ensure this is always in the same spot... */ - - /* getpwnam, getpwuid */ - - struct winbindd_pw { - fstring pw_name; - fstring pw_passwd; - uid_t pw_uid; - gid_t pw_gid; - fstring pw_gecos; - fstring pw_dir; - fstring pw_shell; - } pw; - - /* getgrnam, getgrgid */ - - struct winbindd_gr { - fstring gr_name; - fstring gr_passwd; - gid_t gr_gid; - int num_gr_mem; - int gr_mem_ofs; /* offset to group membership */ - } gr; - - uint32 num_entries; /* getpwent, getgrent */ - struct winbindd_sid { - fstring sid; /* lookupname, [ug]id_to_sid */ - int type; - } sid; - struct winbindd_name { - fstring dom_name; /* lookupsid */ - fstring name; - int type; - } name; - uid_t uid; /* sid_to_uid */ - gid_t gid; /* sid_to_gid */ - struct winbindd_info { - char winbind_separator; - fstring samba_version; - } info; - fstring domain_name; - - struct auth_reply { - uint32 nt_status; - fstring nt_status_string; - fstring error_string; - int pam_error; - } auth; - } data; - - /* Variable length return data */ - - void *extra_data; /* getgrnam, getgrgid, getgrent */ - }; - - #endif --- 0 ---- Index: squid/Makefile.in diff -c squid/Makefile.in:1.6.2.17 squid/Makefile.in:1.6.2.18 *** squid/Makefile.in:1.6.2.17 Mon Sep 30 00:14:48 2002 --- squid/Makefile.in Tue Feb 11 19:02:00 2003 *************** *** 99,104 **** --- 99,105 ---- REPL_OBJS = @REPL_OBJS@ REPL_POLICIES = @REPL_POLICIES@ RM = @RM@ + SAMBASOURCES = @SAMBASOURCES@ SH = @SH@ SNMPLIB = @SNMPLIB@ SSLLIB = @SSLLIB@ *************** *** 132,138 **** QUICKSTART \ README \ SPONSORS \ ! bootstrap.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 133,140 ---- QUICKSTART \ README \ SPONSORS \ ! bootstrap.sh \ ! include/samba/README.txt subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 298,304 **** distdir: $(DISTFILES) -chmod -R a+w $(distdir)>/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/./include $(distdir)/cfgaux $(distdir)/scripts @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$,,ドル'`; \ --- 300,306 ---- distdir: $(DISTFILES) -chmod -R a+w $(distdir)>/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/./include $(distdir)/cfgaux $(distdir)/include/samba $(distdir)/scripts @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$,,ドル'`; \ *************** *** 464,470 **** dist-hook: ! @ for subdir in "include"; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ --- 466,472 ---- dist-hook: ! @ for subdir in include include/samba/nsswitch; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ Index: squid/helpers/basic_auth/winbind/Makefile.in diff -c squid/helpers/basic_auth/winbind/Makefile.in:1.1.2.8 squid/helpers/basic_auth/winbind/Makefile.in:1.1.2.9 *** squid/helpers/basic_auth/winbind/Makefile.in:1.1.2.8 Mon Sep 30 00:15:09 2002 --- squid/helpers/basic_auth/winbind/Makefile.in Tue Feb 11 19:02:30 2003 *************** *** 101,106 **** --- 101,107 ---- REPL_OBJS = @REPL_OBJS@ REPL_POLICIES = @REPL_POLICIES@ RM = @RM@ + SAMBASOURCES = @SAMBASOURCES@ SH = @SH@ SNMPLIB = @SNMPLIB@ SSLLIB = @SSLLIB@ *************** *** 118,125 **** makesnmplib = @makesnmplib@ libexec_PROGRAMS = wb_auth ! wb_auth_SOURCES = wb_basic_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h ! INCLUDES = -I$(top_srcdir)/include LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) subdir = helpers/basic_auth/winbind mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs --- 119,126 ---- makesnmplib = @makesnmplib@ libexec_PROGRAMS = wb_auth ! wb_auth_SOURCES = wb_basic_auth.c wb_common.c wbntlm.h ! INCLUDES = -I$(top_srcdir)/include -I@SAMBASOURCES@ LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) subdir = helpers/basic_auth/winbind mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs Index: squid/helpers/external_acl/winbind_group/Makefile.in diff -c squid/helpers/external_acl/winbind_group/Makefile.in:1.1.2.3 squid/helpers/external_acl/winbind_group/Makefile.in:1.1.2.4 *** squid/helpers/external_acl/winbind_group/Makefile.in:1.1.2.3 Mon Sep 30 00:15:19 2002 --- squid/helpers/external_acl/winbind_group/Makefile.in Tue Feb 11 19:02:50 2003 *************** *** 101,106 **** --- 101,107 ---- REPL_OBJS = @REPL_OBJS@ REPL_POLICIES = @REPL_POLICIES@ RM = @RM@ + SAMBASOURCES = @SAMBASOURCES@ SH = @SH@ SNMPLIB = @SNMPLIB@ SSLLIB = @SSLLIB@ *************** *** 118,127 **** makesnmplib = @makesnmplib@ libexec_PROGRAMS = wb_group ! wb_group_SOURCES = wb_check_group.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h EXTRA_DIST = readme.txt INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src LDADD = -L$(top_builddir)/lib $(XTRA_LIBS) subdir = helpers/external_acl/winbind_group --- 119,128 ---- makesnmplib = @makesnmplib@ libexec_PROGRAMS = wb_group ! wb_group_SOURCES = wb_check_group.c wb_common.c wbntlm.h EXTRA_DIST = readme.txt INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src -I@SAMBASOURCES@ LDADD = -L$(top_builddir)/lib $(XTRA_LIBS) subdir = helpers/external_acl/winbind_group Index: squid/helpers/ntlm_auth/winbind/Makefile.in diff -c squid/helpers/ntlm_auth/winbind/Makefile.in:1.1.2.8 squid/helpers/ntlm_auth/winbind/Makefile.in:1.1.2.9 *** squid/helpers/ntlm_auth/winbind/Makefile.in:1.1.2.8 Mon Sep 30 00:15:26 2002 --- squid/helpers/ntlm_auth/winbind/Makefile.in Tue Feb 11 19:03:06 2003 *************** *** 101,106 **** --- 101,107 ---- REPL_OBJS = @REPL_OBJS@ REPL_POLICIES = @REPL_POLICIES@ RM = @RM@ + SAMBASOURCES = @SAMBASOURCES@ SH = @SH@ SNMPLIB = @SNMPLIB@ SSLLIB = @SSLLIB@ *************** *** 118,130 **** makesnmplib = @makesnmplib@ libexec_PROGRAMS = wb_ntlmauth ! wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h EXTRA_DIST = \ patches/wb_common.patch \ patches/winbind_nss_config.patch INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) subdir = helpers/ntlm_auth/winbind --- 119,131 ---- makesnmplib = @makesnmplib@ libexec_PROGRAMS = wb_ntlmauth ! wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c wbntlm.h EXTRA_DIST = \ patches/wb_common.patch \ patches/winbind_nss_config.patch INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ ! -I$(top_srcdir)/src -I@SAMBASOURCES@ LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) subdir = helpers/ntlm_auth/winbind Index: squid/configure diff -c squid/configure:1.248.2.45 squid/configure:1.248.2.46 *** squid/configure:1.248.2.45 Wed Feb 5 18:16:56 2003 --- squid/configure Tue Feb 11 19:02:00 2003 *************** *** 206,211 **** --- 206,217 ---- process. For a list of available helpers see the helpers/external_acl directory." ac_help="$ac_help + --with-samba-sources=/path/to/samba-source-tree + Path where the correct Samba source files can be + found while building winbind helpers. (defaults to + use internal copies of the headers from Samba-2.2.7) + " + ac_help="$ac_help --disable-unlinkd Do not use unlinkd" ac_help="$ac_help --enable-stacktraces Enable automatic call backtrace on fatal errors" *************** *** 2865,2870 **** --- 2871,2893 ---- fi + + SAMBASOURCES='$(top_srcdir)/include/samba' + # Check whether --with-samba-sources or --without-samba-sources was given. + if test "${with_samba_sources+set}" = set; then + withval="$with_samba_sources" + if test -f $withval/source/nsswitch/winbind_nss_config.h; then + echo "Using Samba sources from $withval" + SAMBASOURCES="$withval/source" + else + echo "ERROR: Cannot find Samba sources at $withval" + exit 1 + fi + + fi + + + # Check whether --enable-unlinkd or --disable-unlinkd was given. if test "${enable_unlinkd+set}" = set; then enableval="$enable_unlinkd" *************** *** 8586,8591 **** --- 8609,8615 ---- s%@NTLM_AUTH_HELPERS@%$NTLM_AUTH_HELPERS%g s%@DIGEST_AUTH_HELPERS@%$DIGEST_AUTH_HELPERS%g s%@EXTERNAL_ACL_HELPERS@%$EXTERNAL_ACL_HELPERS%g + s%@SAMBASOURCES@%$SAMBASOURCES%g s%@ENABLE_UNLINKD_TRUE@%$ENABLE_UNLINKD_TRUE%g s%@ENABLE_UNLINKD_FALSE@%$ENABLE_UNLINKD_FALSE%g s%@CPP@%$CPP%g

AltStyle によって変換されたページ (->オリジナル) /