瀏覽代碼

Cleanup check of blank realm name
Store realm name in hub struct using a preallocated string instead of a pointer

Sacha J Bernstein 11 年之前
父節點
當前提交
9f83dc0ba2
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/Cedar/Hub.h
  2. 1 1
      src/Cedar/Sam.c

+ 1 - 1
src/Cedar/Hub.h

@@ -424,7 +424,7 @@ struct HUB
 	UINT RadiusRetryInterval;			// Radius retry interval
 	BUF *RadiusSecret;					// Radius shared key
 	char RadiusSuffixFilter[MAX_SIZE];	// Radius suffix filter
-	char *RadiusRealm;		// Radius realm (optional)
+	char RadiusRealm[MAX_SIZE];		// Radius realm (optional)
 	volatile bool Halt;					// Halting flag
 	bool Offline;						// Offline
 	bool BeingOffline;					// Be Doing Offline

+ 1 - 1
src/Cedar/Sam.c

@@ -211,7 +211,7 @@ bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *p
 					AUTHRADIUS *auth = (AUTHRADIUS *)u->AuthData;
 					if (ast || auth->RadiusUsername == NULL || UniStrLen(auth->RadiusUsername) == 0)
 					{
-						if( h->RadiusRealm && (StrLen(h->RadiusRealm) > 0) )
+						if( IsEmptyStr(h->RadiusRealm) == false )
 						{	
 							char name_and_realm[MAX_SIZE];
 							StrCpy(name_and_realm, MAX_SIZE, username);