From d73a7e7e9063083f73fcce5170ea9b9682d66ef6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 9 Apr 2010 14:30:54 +0200 Subject: s3: Little refactoring: Factor out skip_space --- source3/smbd/map_username.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/source3/smbd/map_username.c b/source3/smbd/map_username.c index 8cbe40defd..8c8eb2ed9d 100644 --- a/source3/smbd/map_username.c +++ b/source3/smbd/map_username.c @@ -68,6 +68,14 @@ static bool set_last_from_to(const char *from, const char *to) return true; } +static char *skip_space(char *s) +{ + while (isspace((int)(*s))) { + s += 1; + } + return s; +} + bool map_username(struct smbd_server_connection *sconn, fstring user) { XFILE *f; @@ -157,14 +165,11 @@ bool map_username(struct smbd_server_connection *sconn, fstring user) *dosname++ = 0; - while (isspace((int)*unixname)) - unixname++; + unixname = skip_space(unixname); if ('!' == *unixname) { return_if_mapped = True; - unixname++; - while (isspace((int)*unixname)) - unixname++; + unixname = skip_space(unixname+1); } if (!*unixname || strchr_m("#;",*unixname)) -- cgit