Commitf988edb

committed

Add OpenBSD local indent credentials, from William Ahern.

1 parent31504cc commitf988edbCopy full SHA for f988edb

File tree

+36

-7

lines changed

+36

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9819,7 +9819,8 @@ test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"`
`9819`	`9819`
`9820`	`9820`
`9821`	`9821`
`9822`		`-forac_funcin cbrt fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync`
	`9822`	`+`
	`9823`	`+forac_funcin cbrt fcvt getopt_long getpeereid memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync`
`9823`	`9824`	`do`
`9824`	`9825`	as_ac_var=`echo"ac_cv_func_$ac_func"\|$as_tr_sh`
`9825`	`9826`	`echo"$as_me:$LINENO: checking for$ac_func">&5`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $Header: /cvsroot/pgsql/configure.in,v 1.218 2002/11/04 21:36:13 tgl Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.219 2002/12/03 21:50:43 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -782,7 +782,7 @@ PGAC_FUNC_GETTIMEOFDAY_1ARG`
`782`	`782`	`# SunOS doesn't handle negative byte comparisons properly with +/- return`
`783`	`783`	`AC_FUNC_MEMCMP`
`784`	`784`
`785`		`-AC_CHECK_FUNCS([cbrt fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync])`
	`785`	`+AC_CHECK_FUNCS([cbrt fcvt getopt_longgetpeereidmemmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync])`
`786`	`786`
`787`	`787`	`AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])`
`788`	`788`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.41 2002/11/15 03:11:15 momjian Exp $`
	`2`	`+$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.42 2002/12/03 21:50:44 momjian Exp $`
`3`	`3`	`-->`
`4`	`4`
`5`	`5`	`<chapter id="client-authentication">`
`@@ -318,7 +318,8 @@ hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <`
`318`	`318`	`support Unix-domain socket credentials (currently`
`319`	`319`	`<systemitem class=osname>Linux</>, <systemitem`
`320`	`320`	`class=osname>FreeBSD</>, <systemitem class=osname>NetBSD</>,`
`321`		`- and <systemitem class=osname>BSD/OS</>).`
	`321`	`+ <systemitem class=osname>OpenBSD</>, and`
	`322`	`+ <systemitem class=osname>BSD/OS</>).`
`322`	`323`	`</para>`
`323`	`324`
`324`	`325`	`<para>`

Lines changed: 29 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.87 2002/09/04 20:31:19 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.88 2002/12/03 21:50:44 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1216,7 +1216,34 @@ ident_inet(const struct in_addr remote_ip_addr,`
`1216`	`1216`	`staticbool`
`1217`	`1217`	`ident_unix(intsock,char*ident_user)`
`1218`	`1218`	`{`
`1219`		`-#if defined(SO_PEERCRED)`
	`1219`	`+#if defined(HAVE_GETPEEREID)`
	`1220`	`+/* OpenBSD style: */`
	`1221`	`+uid_tuid;`
	`1222`	`+gid_tgid;`
	`1223`	`+structpasswd*pass;`
	`1224`	`+`
	`1225`	`+errno=0;`
	`1226`	`+if (getpeereid(sock,&uid,&gid)!=0)`
	`1227`	`+{`
	`1228`	`+/* We didn't get a valid credentials struct. */`
	`1229`	`+elog(LOG,"ident_unix: error receiving credentials: %m");`
	`1230`	`+return false;`
	`1231`	`+}`
	`1232`	`+`
	`1233`	`+pass=getpwuid(uid);`
	`1234`	`+`
	`1235`	`+if (pass==NULL)`
	`1236`	`+{`
	`1237`	`+elog(LOG,"ident_unix: unknown local user with uid %d",`
	`1238`	`+ (int)uid);`
	`1239`	`+return false;`
	`1240`	`+}`
	`1241`	`+`
	`1242`	`+StrNCpy(ident_user,pass->pw_name,IDENT_USERNAME_MAX+1);`
	`1243`	`+`
	`1244`	`+return true;`
	`1245`	`+`
	`1246`	`+#elsif defined(SO_PEERCRED)`
`1220`	`1247`	`/* Linux style: use getsockopt(SO_PEERCRED) */`
`1221`	`1248`	`structucredpeercred;`
`1222`	`1249`	`ACCEPT_TYPE_ARG3so_len=sizeof(peercred);`

Comments

(0)