]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Replace spaces with tabs.
authorDarren Tucker <dtucker@zip.com.au>
Tue, 2 Aug 2016 00:01:52 +0000 (10:01 +1000)
committerDarren Tucker <dtucker@zip.com.au>
Tue, 2 Aug 2016 00:01:52 +0000 (10:01 +1000)
Mechanically replace spaces with tabs in compat files not synced with
OpenBSD.

openbsd-compat/bsd-misc.c
openbsd-compat/bsd-waitpid.c
openbsd-compat/fake-rfc2553.c
openbsd-compat/port-irix.c
openbsd-compat/xcrypt.c

index f117316309fd3ad2b89144fdb72c3781b68c9303..6f3bc8f1d4f079fd183a46d8458b13bc56b8dacd 100644 (file)
@@ -71,7 +71,7 @@ int setlogin(const char *name)
 
 #ifndef HAVE_INNETGR
 int innetgr(const char *netgroup, const char *host,
-            const char *user, const char *domain)
+           const char *user, const char *domain)
 {
        return (0);
 }
index c21fbe9110065d15c361fc93f893b52bec37d390..113fb1ea91ae84a19eff98312ccde436b4b2f0c8 100644 (file)
@@ -43,11 +43,11 @@ waitpid(int pid, int *stat_loc, int options)
                /* wait4() wants pid=0 for indiscriminate wait. */
                pid = 0;
        }
-        wait_pid = wait4(pid, &statusp, options, NULL);
+       wait_pid = wait4(pid, &statusp, options, NULL);
        if (stat_loc)
-               *stat_loc = (int) statusp.w_status;
+               *stat_loc = (int) statusp.w_status;
 
-        return (wait_pid);
+       return (wait_pid);
 }
 
 #endif /* !HAVE_WAITPID */
index 55c95625eb6c6e3ef1207ef08f1e6f8ebcb28bd8..d5a62975aa468a91de9a515520c6ecfb34433aab 100644 (file)
@@ -45,7 +45,7 @@
 
 #ifndef HAVE_GETNAMEINFO
 int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
-                size_t hostlen, char *serv, size_t servlen, int flags)
+               size_t hostlen, char *serv, size_t servlen, int flags)
 {
        struct sockaddr_in *sin = (struct sockaddr_in *)sa;
        struct hostent *hp;
index ba751a5383f3b8e7d8f6a9dc170465b7922c2a2f..525b029092fb382392971c217be6795604b3369c 100644 (file)
@@ -47,42 +47,42 @@ void
 irix_setusercontext(struct passwd *pw)
 {
 #ifdef WITH_IRIX_PROJECT
-        prid_t projid;
+       prid_t projid;
 #endif
 #ifdef WITH_IRIX_JOBS
-        jid_t jid = 0;
+       jid_t jid = 0;
 #elif defined(WITH_IRIX_ARRAY)
-        int jid = 0;
+       int jid = 0;
 #endif
 
 #ifdef WITH_IRIX_JOBS
-        jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
-        if (jid == -1)
-                fatal("Failed to create job container: %.100s",
-                    strerror(errno));
+       jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
+       if (jid == -1)
+               fatal("Failed to create job container: %.100s",
+                   strerror(errno));
 #endif /* WITH_IRIX_JOBS */
 #ifdef WITH_IRIX_ARRAY
-        /* initialize array session */
-        if (jid == 0  && newarraysess() != 0)
-                fatal("Failed to set up new array session: %.100s",
-                    strerror(errno));
+       /* initialize array session */
+       if (jid == 0  && newarraysess() != 0)
+               fatal("Failed to set up new array session: %.100s",
+                   strerror(errno));
 #endif /* WITH_IRIX_ARRAY */
 #ifdef WITH_IRIX_PROJECT
-        /* initialize irix project info */
-        if ((projid = getdfltprojuser(pw->pw_name)) == -1) {
-                debug("Failed to get project id, using projid 0");
-                projid = 0;
-        }
-        if (setprid(projid))
-                fatal("Failed to initialize project %d for %s: %.100s",
-                    (int)projid, pw->pw_name, strerror(errno));
+       /* initialize irix project info */
+       if ((projid = getdfltprojuser(pw->pw_name)) == -1) {
+               debug("Failed to get project id, using projid 0");
+               projid = 0;
+       }
+       if (setprid(projid))
+               fatal("Failed to initialize project %d for %s: %.100s",
+                   (int)projid, pw->pw_name, strerror(errno));
 #endif /* WITH_IRIX_PROJECT */
 #ifdef WITH_IRIX_AUDIT
-        if (sysconf(_SC_AUDIT)) {
-                debug("Setting sat id to %d", (int) pw->pw_uid);
-                if (satsetid(pw->pw_uid))
-                        debug("error setting satid: %.100s", strerror(errno));
-        }
+       if (sysconf(_SC_AUDIT)) {
+               debug("Setting sat id to %d", (int) pw->pw_uid);
+               if (satsetid(pw->pw_uid))
+                       debug("error setting satid: %.100s", strerror(errno));
+       }
 #endif /* WITH_IRIX_AUDIT */
 }
 
index 532154f7fc117bd48e7710e034e5080a0b576b69..c9c6283cccecb3271c01cacacd5cbe2b4fc3d959 100644 (file)
@@ -108,19 +108,19 @@ xcrypt(const char *password, const char *salt)
                salt = pick_salt();
 
 # ifdef HAVE_MD5_PASSWORDS
-        if (is_md5_salt(salt))
-                crypted = md5_crypt(password, salt);
-        else
-                crypted = crypt(password, salt);
+       if (is_md5_salt(salt))
+               crypted = md5_crypt(password, salt);
+       else
+               crypted = crypt(password, salt);
 # elif defined(__hpux) && !defined(HAVE_SECUREWARE)
        if (iscomsec())
-                crypted = bigcrypt(password, salt);
-        else
-                crypted = crypt(password, salt);
+               crypted = bigcrypt(password, salt);
+       else
+               crypted = crypt(password, salt);
 # elif defined(HAVE_SECUREWARE)
-        crypted = bigcrypt(password, salt);
+       crypted = bigcrypt(password, salt);
 # else
-        crypted = crypt(password, salt);
+       crypted = crypt(password, salt);
 # endif
 
        return crypted;