tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace spaces with tabs. 

Mechanically replace spaces with tabs in compat files not synced with
OpenBSD.
This commit is contained in:
Darren Tucker 2016-08-02 10:01:52 +10:00
parent c20dccb561
commit dd1031b78b
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsd-compat/bsd-misc.c
View 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);
}

6
openbsd-compat/bsd-waitpid.c
View 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 */

2
openbsd-compat/fake-rfc2553.c
View 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;

48
openbsd-compat/port-irix.c
View 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 */
}

18
openbsd-compat/xcrypt.c
View 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;