summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-08-02 10:01:52 +1000
committerDarren Tucker <dtucker@zip.com.au>2016-08-02 10:01:52 +1000
commitdd1031b78b83083615b68d7163c44f4408635be2 (patch)
tree623e682acf27a2abf422a27325e5bbad7c5be4b0 /openbsd-compat
parentc20dccb5614c5714f4155dda01bcdebf97cfae7e (diff)
Replace spaces with tabs.
Mechanically replace spaces with tabs in compat files not synced with OpenBSD.
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/bsd-misc.c2
-rw-r--r--openbsd-compat/bsd-waitpid.c6
-rw-r--r--openbsd-compat/fake-rfc2553.c2
-rw-r--r--openbsd-compat/port-irix.c48
-rw-r--r--openbsd-compat/xcrypt.c18
5 files changed, 38 insertions, 38 deletions
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index f11731630..6f3bc8f1d 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -71,7 +71,7 @@ int setlogin(const char *name)
71 71
72#ifndef HAVE_INNETGR 72#ifndef HAVE_INNETGR
73int innetgr(const char *netgroup, const char *host, 73int innetgr(const char *netgroup, const char *host,
74 const char *user, const char *domain) 74 const char *user, const char *domain)
75{ 75{
76 return (0); 76 return (0);
77} 77}
diff --git a/openbsd-compat/bsd-waitpid.c b/openbsd-compat/bsd-waitpid.c
index c21fbe911..113fb1ea9 100644
--- a/openbsd-compat/bsd-waitpid.c
+++ b/openbsd-compat/bsd-waitpid.c
@@ -43,11 +43,11 @@ waitpid(int pid, int *stat_loc, int options)
43 /* wait4() wants pid=0 for indiscriminate wait. */ 43 /* wait4() wants pid=0 for indiscriminate wait. */
44 pid = 0; 44 pid = 0;
45 } 45 }
46 wait_pid = wait4(pid, &statusp, options, NULL); 46 wait_pid = wait4(pid, &statusp, options, NULL);
47 if (stat_loc) 47 if (stat_loc)
48 *stat_loc = (int) statusp.w_status; 48 *stat_loc = (int) statusp.w_status;
49 49
50 return (wait_pid); 50 return (wait_pid);
51} 51}
52 52
53#endif /* !HAVE_WAITPID */ 53#endif /* !HAVE_WAITPID */
diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c
index 55c95625e..d5a62975a 100644
--- a/openbsd-compat/fake-rfc2553.c
+++ b/openbsd-compat/fake-rfc2553.c
@@ -45,7 +45,7 @@
45 45
46#ifndef HAVE_GETNAMEINFO 46#ifndef HAVE_GETNAMEINFO
47int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 47int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
48 size_t hostlen, char *serv, size_t servlen, int flags) 48 size_t hostlen, char *serv, size_t servlen, int flags)
49{ 49{
50 struct sockaddr_in *sin = (struct sockaddr_in *)sa; 50 struct sockaddr_in *sin = (struct sockaddr_in *)sa;
51 struct hostent *hp; 51 struct hostent *hp;
diff --git a/openbsd-compat/port-irix.c b/openbsd-compat/port-irix.c
index ba751a538..525b02909 100644
--- a/openbsd-compat/port-irix.c
+++ b/openbsd-compat/port-irix.c
@@ -47,42 +47,42 @@ void
47irix_setusercontext(struct passwd *pw) 47irix_setusercontext(struct passwd *pw)
48{ 48{
49#ifdef WITH_IRIX_PROJECT 49#ifdef WITH_IRIX_PROJECT
50 prid_t projid; 50 prid_t projid;
51#endif 51#endif
52#ifdef WITH_IRIX_JOBS 52#ifdef WITH_IRIX_JOBS
53 jid_t jid = 0; 53 jid_t jid = 0;
54#elif defined(WITH_IRIX_ARRAY) 54#elif defined(WITH_IRIX_ARRAY)
55 int jid = 0; 55 int jid = 0;
56#endif 56#endif
57 57
58#ifdef WITH_IRIX_JOBS 58#ifdef WITH_IRIX_JOBS
59 jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); 59 jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
60 if (jid == -1) 60 if (jid == -1)
61 fatal("Failed to create job container: %.100s", 61 fatal("Failed to create job container: %.100s",
62 strerror(errno)); 62 strerror(errno));
63#endif /* WITH_IRIX_JOBS */ 63#endif /* WITH_IRIX_JOBS */
64#ifdef WITH_IRIX_ARRAY 64#ifdef WITH_IRIX_ARRAY
65 /* initialize array session */ 65 /* initialize array session */
66 if (jid == 0 && newarraysess() != 0) 66 if (jid == 0 && newarraysess() != 0)
67 fatal("Failed to set up new array session: %.100s", 67 fatal("Failed to set up new array session: %.100s",
68 strerror(errno)); 68 strerror(errno));
69#endif /* WITH_IRIX_ARRAY */ 69#endif /* WITH_IRIX_ARRAY */
70#ifdef WITH_IRIX_PROJECT 70#ifdef WITH_IRIX_PROJECT
71 /* initialize irix project info */ 71 /* initialize irix project info */
72 if ((projid = getdfltprojuser(pw->pw_name)) == -1) { 72 if ((projid = getdfltprojuser(pw->pw_name)) == -1) {
73 debug("Failed to get project id, using projid 0"); 73 debug("Failed to get project id, using projid 0");
74 projid = 0; 74 projid = 0;
75 } 75 }
76 if (setprid(projid)) 76 if (setprid(projid))
77 fatal("Failed to initialize project %d for %s: %.100s", 77 fatal("Failed to initialize project %d for %s: %.100s",
78 (int)projid, pw->pw_name, strerror(errno)); 78 (int)projid, pw->pw_name, strerror(errno));
79#endif /* WITH_IRIX_PROJECT */ 79#endif /* WITH_IRIX_PROJECT */
80#ifdef WITH_IRIX_AUDIT 80#ifdef WITH_IRIX_AUDIT
81 if (sysconf(_SC_AUDIT)) { 81 if (sysconf(_SC_AUDIT)) {
82 debug("Setting sat id to %d", (int) pw->pw_uid); 82 debug("Setting sat id to %d", (int) pw->pw_uid);
83 if (satsetid(pw->pw_uid)) 83 if (satsetid(pw->pw_uid))
84 debug("error setting satid: %.100s", strerror(errno)); 84 debug("error setting satid: %.100s", strerror(errno));
85 } 85 }
86#endif /* WITH_IRIX_AUDIT */ 86#endif /* WITH_IRIX_AUDIT */
87} 87}
88 88
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index 532154f7f..c9c6283cc 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -108,19 +108,19 @@ xcrypt(const char *password, const char *salt)
108 salt = pick_salt(); 108 salt = pick_salt();
109 109
110# ifdef HAVE_MD5_PASSWORDS 110# ifdef HAVE_MD5_PASSWORDS
111 if (is_md5_salt(salt)) 111 if (is_md5_salt(salt))
112 crypted = md5_crypt(password, salt); 112 crypted = md5_crypt(password, salt);
113 else 113 else
114 crypted = crypt(password, salt); 114 crypted = crypt(password, salt);
115# elif defined(__hpux) && !defined(HAVE_SECUREWARE) 115# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
116 if (iscomsec()) 116 if (iscomsec())
117 crypted = bigcrypt(password, salt); 117 crypted = bigcrypt(password, salt);
118 else 118 else
119 crypted = crypt(password, salt); 119 crypted = crypt(password, salt);
120# elif defined(HAVE_SECUREWARE) 120# elif defined(HAVE_SECUREWARE)
121 crypted = bigcrypt(password, salt); 121 crypted = bigcrypt(password, salt);
122# else 122# else
123 crypted = crypt(password, salt); 123 crypted = crypt(password, salt);
124# endif 124# endif
125 125
126 return crypted; 126 return crypted;