mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-29 16:54:51 +02:00
Replace spaces with tabs.
Mechanically replace spaces with tabs in compat files not synced with OpenBSD.
This commit is contained in:
parent
c20dccb561
commit
dd1031b78b
@ -71,7 +71,7 @@ int setlogin(const char *name)
|
|||||||
|
|
||||||
#ifndef HAVE_INNETGR
|
#ifndef HAVE_INNETGR
|
||||||
int innetgr(const char *netgroup, const char *host,
|
int innetgr(const char *netgroup, const char *host,
|
||||||
const char *user, const char *domain)
|
const char *user, const char *domain)
|
||||||
{
|
{
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
@ -43,11 +43,11 @@ waitpid(int pid, int *stat_loc, int options)
|
|||||||
/* wait4() wants pid=0 for indiscriminate wait. */
|
/* wait4() wants pid=0 for indiscriminate wait. */
|
||||||
pid = 0;
|
pid = 0;
|
||||||
}
|
}
|
||||||
wait_pid = wait4(pid, &statusp, options, NULL);
|
wait_pid = wait4(pid, &statusp, options, NULL);
|
||||||
if (stat_loc)
|
if (stat_loc)
|
||||||
*stat_loc = (int) statusp.w_status;
|
*stat_loc = (int) statusp.w_status;
|
||||||
|
|
||||||
return (wait_pid);
|
return (wait_pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* !HAVE_WAITPID */
|
#endif /* !HAVE_WAITPID */
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
#ifndef HAVE_GETNAMEINFO
|
#ifndef HAVE_GETNAMEINFO
|
||||||
int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
|
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 sockaddr_in *sin = (struct sockaddr_in *)sa;
|
||||||
struct hostent *hp;
|
struct hostent *hp;
|
||||||
|
@ -47,42 +47,42 @@ void
|
|||||||
irix_setusercontext(struct passwd *pw)
|
irix_setusercontext(struct passwd *pw)
|
||||||
{
|
{
|
||||||
#ifdef WITH_IRIX_PROJECT
|
#ifdef WITH_IRIX_PROJECT
|
||||||
prid_t projid;
|
prid_t projid;
|
||||||
#endif
|
#endif
|
||||||
#ifdef WITH_IRIX_JOBS
|
#ifdef WITH_IRIX_JOBS
|
||||||
jid_t jid = 0;
|
jid_t jid = 0;
|
||||||
#elif defined(WITH_IRIX_ARRAY)
|
#elif defined(WITH_IRIX_ARRAY)
|
||||||
int jid = 0;
|
int jid = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_IRIX_JOBS
|
#ifdef WITH_IRIX_JOBS
|
||||||
jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
|
jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
|
||||||
if (jid == -1)
|
if (jid == -1)
|
||||||
fatal("Failed to create job container: %.100s",
|
fatal("Failed to create job container: %.100s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
#endif /* WITH_IRIX_JOBS */
|
#endif /* WITH_IRIX_JOBS */
|
||||||
#ifdef WITH_IRIX_ARRAY
|
#ifdef WITH_IRIX_ARRAY
|
||||||
/* initialize array session */
|
/* initialize array session */
|
||||||
if (jid == 0 && newarraysess() != 0)
|
if (jid == 0 && newarraysess() != 0)
|
||||||
fatal("Failed to set up new array session: %.100s",
|
fatal("Failed to set up new array session: %.100s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
#endif /* WITH_IRIX_ARRAY */
|
#endif /* WITH_IRIX_ARRAY */
|
||||||
#ifdef WITH_IRIX_PROJECT
|
#ifdef WITH_IRIX_PROJECT
|
||||||
/* initialize irix project info */
|
/* initialize irix project info */
|
||||||
if ((projid = getdfltprojuser(pw->pw_name)) == -1) {
|
if ((projid = getdfltprojuser(pw->pw_name)) == -1) {
|
||||||
debug("Failed to get project id, using projid 0");
|
debug("Failed to get project id, using projid 0");
|
||||||
projid = 0;
|
projid = 0;
|
||||||
}
|
}
|
||||||
if (setprid(projid))
|
if (setprid(projid))
|
||||||
fatal("Failed to initialize project %d for %s: %.100s",
|
fatal("Failed to initialize project %d for %s: %.100s",
|
||||||
(int)projid, pw->pw_name, strerror(errno));
|
(int)projid, pw->pw_name, strerror(errno));
|
||||||
#endif /* WITH_IRIX_PROJECT */
|
#endif /* WITH_IRIX_PROJECT */
|
||||||
#ifdef WITH_IRIX_AUDIT
|
#ifdef WITH_IRIX_AUDIT
|
||||||
if (sysconf(_SC_AUDIT)) {
|
if (sysconf(_SC_AUDIT)) {
|
||||||
debug("Setting sat id to %d", (int) pw->pw_uid);
|
debug("Setting sat id to %d", (int) pw->pw_uid);
|
||||||
if (satsetid(pw->pw_uid))
|
if (satsetid(pw->pw_uid))
|
||||||
debug("error setting satid: %.100s", strerror(errno));
|
debug("error setting satid: %.100s", strerror(errno));
|
||||||
}
|
}
|
||||||
#endif /* WITH_IRIX_AUDIT */
|
#endif /* WITH_IRIX_AUDIT */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,19 +108,19 @@ xcrypt(const char *password, const char *salt)
|
|||||||
salt = pick_salt();
|
salt = pick_salt();
|
||||||
|
|
||||||
# ifdef HAVE_MD5_PASSWORDS
|
# ifdef HAVE_MD5_PASSWORDS
|
||||||
if (is_md5_salt(salt))
|
if (is_md5_salt(salt))
|
||||||
crypted = md5_crypt(password, salt);
|
crypted = md5_crypt(password, salt);
|
||||||
else
|
else
|
||||||
crypted = crypt(password, salt);
|
crypted = crypt(password, salt);
|
||||||
# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
|
# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
|
||||||
if (iscomsec())
|
if (iscomsec())
|
||||||
crypted = bigcrypt(password, salt);
|
crypted = bigcrypt(password, salt);
|
||||||
else
|
else
|
||||||
crypted = crypt(password, salt);
|
crypted = crypt(password, salt);
|
||||||
# elif defined(HAVE_SECUREWARE)
|
# elif defined(HAVE_SECUREWARE)
|
||||||
crypted = bigcrypt(password, salt);
|
crypted = bigcrypt(password, salt);
|
||||||
# else
|
# else
|
||||||
crypted = crypt(password, salt);
|
crypted = crypt(password, salt);
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
return crypted;
|
return crypted;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user