---------------------
PatchSet 3634 
Date: 2002/01/27 19:44:54
Author: serassio
Branch: nt-2_3
Tag: (none) 
Log:
Added default domain setting to NT_auth authenticator in external .ini files

Members: 
	auth_modules/NT/NT_auth.c:1.1.2.3->1.1.2.4 
	auth_modules/NT/valid.c:1.1.2.3->1.1.2.4 
	auth_modules/NT/valid.h:1.1.2.1->1.1.2.2 

Index: squid/auth_modules/NT/NT_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/NT/Attic/NT_auth.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid/auth_modules/NT/NT_auth.c	6 Jan 2002 11:15:52 -0000	1.1.2.3
+++ squid/auth_modules/NT/NT_auth.c	27 Jan 2002 19:44:54 -0000	1.1.2.4
@@ -46,6 +46,7 @@
 #if defined (_SQUID_CYGWIN_)
 
 static char NTGroup[256];
+
 int
 main(int argc, char **argv)
 
@@ -59,6 +60,8 @@
 }
 authenticateStateData;
 static char *NTGroup = NULL;
+extern char Default_NTDomain[256];
+
 BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason,
     LPVOID reserved /* Not used. */ );
 
@@ -130,11 +133,25 @@
 #ifndef _SQUID_CYGWIN_
 
 __declspec(dllexport)
-    int Init(char *Group)
+    int Init(char * Group)
 {
+    char path[FILENAME_MAX]="";
+    char target_file[FILENAME_MAX]="";
+    char drive[_MAX_DRIVE]="";
+    char fname[_MAX_FNAME]="";
+    char dir[_MAX_DIR]="";
+    char ext[_MAX_EXT]="";
+    
     if (NTGroup)
 	xfree(NTGroup);
     NTGroup = xstrdup(Group);
+    
+    GetModuleFileName(NULL, path, FILENAME_MAX);
+    _splitpath(path,drive,dir,fname,ext);
+    _makepath(target_file, drive, dir, "nt_auth","ini");
+    if (GetPrivateProfileString("NT_auth", "SearchString", NTV_DEFAULT_DOMAIN, Default_NTDomain, sizeof(Default_NTDomain), target_file) == 0)
+	return 1;
+
     return 0;
 }
 BOOL APIENTRY
Index: squid/auth_modules/NT/valid.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/NT/Attic/valid.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid/auth_modules/NT/valid.c	6 Jan 2002 10:15:23 -0000	1.1.2.3
+++ squid/auth_modules/NT/valid.c	27 Jan 2002 19:44:54 -0000	1.1.2.4
@@ -11,6 +11,8 @@
 #include <lm.h>
 #include "valid.h"
 
+char Default_NTDomain[256];
+
 int
 Valid_User(char *UserName, char *Password, char *Group)
 {
@@ -44,7 +46,7 @@
     strcpy(NTDomain, UserName);
     if ((domain_qualify = strchr(NTDomain, '\\')) == NULL) {
 	strcpy(DomainUser, NTDomain);
-	strcpy(NTDomain, ".");
+	strcpy(NTDomain, Default_NTDomain);
     } else {
 	strcpy(DomainUser, domain_qualify + 1);
 	domain_qualify[0] = '\0';
Index: squid/auth_modules/NT/valid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/NT/Attic/valid.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/auth_modules/NT/valid.h	6 Jan 2001 12:48:44 -0000	1.1.2.1
+++ squid/auth_modules/NT/valid.h	27 Jan 2002 19:44:54 -0000	1.1.2.2
@@ -11,6 +11,8 @@
 #define LOGON32_LOGON_NETWORK       3
 #endif
 
+#define NTV_DEFAULT_DOMAIN "."
+
 int Valid_User(char *,char *, char *);
 
 #endif