It is more logical to filter the users to include in the report after they
have been aliased to the final name. It makes it possible to identify the
final user irrespective of the name she happens to have when connecting to
the proxy.
if (strlen(user)>MAX_USER_LEN)
return(USERERR_NameTooLong);
if (strlen(user)>MAX_USER_LEN)
return(USERERR_NameTooLong);
- // include_users
- if (IncludeUsers[0] != '\0') {
- char wuser[MAX_USER_LEN+2]=":";
- char *str;
-
- strcat(wuser,user);
- strcat(wuser,":");
- str=strstr(IncludeUsers,wuser);
- if (!str)
- return(USERERR_Excluded);
- }
-
if (testvaliduserchar(user))
return(USERERR_InvalidChar);
if (testvaliduserchar(user))
return(USERERR_InvalidChar);
+ // include_users
+ if (IncludeUsers[0] != '\0') {
+ char wuser[MAX_USER_LEN+2]=":";
+ char *str;
+
+ strcat(wuser,user);
+ strcat(wuser,":");
+ str=strstr(IncludeUsers,wuser);
+ if (!str)
+ return(USERERR_Excluded);
+ }
+
if (user[0]=='\0' || (user[1]=='\0' && (user[0]=='-' || user[0]==' ' || user[0]==':')))
return(USERERR_EmptyUser);
if (user[0]=='\0' || (user[1]=='\0' && (user[0]=='-' || user[0]==' ' || user[0]==':')))
return(USERERR_EmptyUser);