sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

Revert "nsswitch: remove unused code from wbinfo.c"

Browse Source 
This reverts commit 3bdd2efff8d11448275965b464ac194a2ee0d3ae.

Undo the library version bump.
This commit is contained in:
Michael Adam 2011-02-10 10:59:18 +01:00
parent ad0a3185ce
commit 76ea4fd03a
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nsswitch/wbinfo.c
View File

@ -139,6 +139,31 @@ static bool parse_wbinfo_domain_user(const char *domuser, fstring domain,
return true; return true;
} }
/* Parse string of "uid,sid" or "gid,sid" into separate int and string values.
* Return true if input was valid, false otherwise. */
static bool parse_mapping_arg(char *arg, int *id, char **sid)
{
char *tmp, *endptr;
if (!arg || !*arg)
return false;
tmp = strtok(arg, ",");
*sid = strtok(NULL, ",");
if (!tmp || !*tmp || !*sid || !**sid)
return false;
/* Because atoi() can return 0 on invalid input, which would be a valid
* UID/GID we must use strtoul() and do error checking */
*id = strtoul(tmp, &endptr, 10);
if (endptr[0] != '\0')
return false;
return true;
}
/* pull pwent info for a given user */ /* pull pwent info for a given user */
static bool wbinfo_get_userinfo(char *user) static bool wbinfo_get_userinfo(char *user)
@ -1837,8 +1862,10 @@ int main(int argc, char **argv, char **envp)
TALLOC_CTX *frame = talloc_stackframe(); TALLOC_CTX *frame = talloc_stackframe();
poptContext pc; poptContext pc;
static char *string_arg; static char *string_arg;
char *string_subarg = NULL;
static char *opt_domain_name; static char *opt_domain_name;
static int int_arg; static int int_arg;
int int_subarg = -1;
int result = 1; int result = 1;
bool verbose = false; bool verbose = false;
bool use_ntlmv2 = false; bool use_ntlmv2 = false;