Merge pull request #2 from ajaykini/aix_audit_support_final

conditional compilation checks specifc to AIX in setresuid

Author: ajaykini

Makefile.in

@@ -121,11 +121,11 @@ SSHOBJS=  ssh.o readconf.o clientloop.o sshtty.o \
 SSHDOBJS=sshd.o \
 	platform-listen.o \
 	servconf.o sshpty.o srclimit.o groupaccess.o auth2-methods.o \
-	dns.o fatal.o compat.o utf8.o authfd.o canohost.o packet.o\
+	dns.o fatal.o compat.o utf8.o authfd.o canohost.o \
 	$(P11OBJS) $(SKOBJS)
 
 SSHD_SESSION_OBJS=sshd-session.o auth-rhosts.o auth-passwd.o \
-	audit.o audit-bsm.o audit-linux.o platform.o packet.o\
+	audit.o audit-bsm.o audit-linux.o platform.o \
 	sshpty.o sshlogin.o servconf.o serverloop.o \
 	auth.o auth2.o auth2-methods.o auth-options.o session.o \
 	auth2-chall.o groupaccess.o \

openbsd-compat/bsd-setres_id.c

@@ -21,9 +21,11 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
+#ifdef _AIX
 #include <sys/id.h>
 #include <userpriv.h>
 #include <sys/priv.h>
+#endif
 
 #include "log.h"
 
@@ -90,17 +92,22 @@ setresuid(uid_t ruid, uid_t euid, uid_t suid)
 		ret = -1;
 	}
 # endif
-	
-	debug("Executing setuid : ");
-	if (setuidx(ID_EFFECTIVE|ID_REAL|ID_SAVED,ruid) < 0) {
+#ifdef _AIX
+	if (setuidx(ID_EFFECTIVE|ID_REAL|ID_SAVED,ruid) < 0)  {
+#else
+	if (setuid(ruid) < 0) {
+#endif
 		saved_errno = errno;
 		error("setuid %lu: %.100s", (u_long)ruid, strerror(errno));
 		errno = saved_errno;
 		ret = -1;
 	}
+#ifdef _AIX
 	priv_clrall(&set_pv);
 	privbit_set(&set_pv,PV_AU_);
 	setppriv(getpid(), (privg_tp)&set_pv, (privg_tp)&set_pv, (privg_tp)&set_pv, NULL);
+#endif
+
 #endif
 	return ret;
 }