Commit1ad6878

committed

Revert patch that removed BUFSIZ usage. The memory has to hold the

structures plus pointers used by the structure.

1 parentdd67707 commit1ad6878Copy full SHA for 1ad6878

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.92 2004/09/27 23:38:45 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.93 2004/09/28 00:06:02 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -749,7 +749,7 @@ fe_getauthname(char *PQerrormsg)`
`749`	`749`	`if (GetUserName(username,&namesize))`
`750`	`750`	`name=username;`
`751`	`751`	`#else`
`752`		`-charpwdbuf[sizeof(structpasswd)];`
	`752`	`+charpwdbuf[BUFSIZ];`
`753`	`753`	`structpasswdpwdstr;`
`754`	`754`	`structpasswd*pw=NULL;`
`755`	`755`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.53 2004/09/27 23:38:45 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.54 2004/09/28 00:06:02 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* [ Most of these notes are wrong/obsolete, but perhaps not all ]`
`@@ -512,7 +512,7 @@ verify_peer(PGconn *conn)`
`512`	`512`
`513`	`513`	`{`
`514`	`514`	`structhostenthpstr;`
`515`		`-charbuf[sizeof(structhostent)];`
	`515`	`+charbuf[BUFSIZ];`
`516`	`516`	`intherrno=0;`
`517`	`517`
`518`	`518`	`/*`
`@@ -598,7 +598,7 @@ load_dh_file(int keylength)`
`598`	`598`	`#ifdefWIN32`
`599`	`599`	`returnNULL;`
`600`	`600`	`#else`
`601`		`-charpwdbuf[sizeof(structpasswd)];`
	`601`	`+charpwdbuf[BUFSIZ];`
`602`	`602`	`structpasswdpwdstr;`
`603`	`603`	`structpasswd*pwd=NULL;`
`604`	`604`	`FILE*fp;`
`@@ -745,7 +745,7 @@ client_cert_cb(SSL ssl, X509 x509, EVP_PKEY *pkey)`
`745`	`745`	`#ifdefWIN32`
`746`	`746`	`return0;`
`747`	`747`	`#else`
`748`		`-charpwdbuf[sizeof(structpasswd)];`
	`748`	`+charpwdbuf[BUFSIZ];`
`749`	`749`	`structpasswdpwdstr;`
`750`	`750`	`structpasswd*pwd=NULL;`
`751`	`751`	`structstatbuf,`
`@@ -952,7 +952,7 @@ initialize_SSL(PGconn *conn)`
`952`	`952`	`{`
`953`	`953`	`#ifndefWIN32`
`954`	`954`	`structstatbuf;`
`955`		`-charpwdbuf[sizeof(structpasswd)];`
	`955`	`+charpwdbuf[BUFSIZ];`
`956`	`956`	`structpasswdpwdstr;`
`957`	`957`	`structpasswd*pwd=NULL;`
`958`	`958`	`charfnbuf[MAXPGPATH];`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.14 2004/09/27 23:39:14 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.15 2004/09/28 00:07:01 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -85,7 +85,7 @@ getaddrinfo(const char node, const char service,`
`85`	`85`
`86`	`86`	`#ifdefFRONTEND`
`87`	`87`	`structhostenthpstr;`
`88`		`-charbuf[sizeof(structhostent)];`
	`88`	`+charbuf[BUFSIZ];`
`89`	`89`	`intherrno=0;`
`90`	`90`
`91`	`91`	`pqGethostbyname(node,&hpstr,buf,sizeof(buf),`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/port/thread.c,v 1.27 2004/09/27 23:39:14 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/port/thread.c,v 1.28 2004/09/28 00:07:01 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -103,13 +103,15 @@ pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,`
`103`	`103`	`/* POSIX version */`
`104`	`104`	`getpwuid_r(uid,resultbuf,buffer,buflen,result);`
`105`	`105`	`#else`
	`106`	`+`
`106`	`107`	`/*`
`107`	`108`	`* Early POSIX draft of getpwuid_r() returns 'struct passwd *'.`
`108`	`109`	`* getpwuid_r(uid, resultbuf, buffer, buflen)`
`109`	`110`	`*/`
`110`	`111`	`*result=getpwuid_r(uid,resultbuf,buffer,buflen);`
`111`	`112`	`#endif`
`112`	`113`	`#else`
	`114`	`+`
`113`	`115`	`/* no getpwuid_r() available, just use getpwuid() */`
`114`	`116`	`*result=getpwuid(uid);`
`115`	`117`	`#endif`

Comments

(0)