Use fstrcpy/pstrcpy when that's what we really mean...

Andrew Bartlett

diff --git a/source/smbd/password.c b/source/smbd/password.c
index 784c1525c897162da24f800f046bd0024837a7d5..175c1ec3a9fed2c9c2c5b0a49b923076c9373142 100644 (file)
--- a/source/smbd/password.c
+++ b/source/smbd/password.c
@@ -249,7 +249,7 @@ void add_session_user(const char *user)
 
   if (!(passwd = Get_Pwnam(user))) return;
 
-  StrnCpy(suser,passwd->pw_name,sizeof(suser)-1);
+  fstrcpy(suser,passwd->pw_name);
 
   if (suser && *suser && !in_list(suser,session_users,False))
     {
@@ -447,7 +447,7 @@ and given password ok\n", user));
        if (!ok && lp_username(snum)) {
                char *auser;
                pstring user_list;
-               StrnCpy(user_list,lp_username(snum),sizeof(pstring));
+               pstrcpy(user_list,lp_username(snum));
                
                pstring_sub(user_list,"%S",lp_servicename(snum));
                
@@ -477,7 +477,7 @@ and given password ok (%s)\n", user));
        /* check for a normal guest connection */
        if (!ok && GUEST_OK(snum)) {
                fstring guestname;
-               StrnCpy(guestname,lp_guestaccount(),sizeof(guestname)-1);
+               fstrcpy(guestname,lp_guestaccount());
                if (Get_Pwnam(guestname)) {
                        fstrcpy(user,guestname);
                        ok = True;

diff --git a/source/smbd/service.c b/source/smbd/service.c
index 18a92bc82ff505d6d3077f9edfc67c1f04012976..cfb5e0e4143645307e0350a14a1b97f81524fba1 100644 (file)
--- a/source/smbd/service.c
+++ b/source/smbd/service.c
@@ -486,13 +486,14 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                pstring tmp_gname;
                BOOL user_must_be_member = False;
                
-               StrnCpy(tmp_gname,lp_force_group(snum),sizeof(pstring)-1);
+               pstrcpy(tmp_gname,lp_force_group(snum));
                
                if (tmp_gname[0] == '+') {
                        user_must_be_member = True;
-                       StrnCpy(gname,&tmp_gname[1],sizeof(pstring)-2);
+                       /* even now, tmp_gname is null terminated */
+                       pstrcpy(gname,&tmp_gname[1]);
                } else {
-                       StrnCpy(gname,tmp_gname,sizeof(pstring)-1);
+                       pstrcpy(gname,tmp_gname);
                }
                /* default service may be a group name          */
                pstring_sub(gname,"%S",lp_servicename(snum));