8
8
*
9
9
*
10
10
* IDENTIFICATION
11
- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.361 2008/09/22 13:55:14 tgl Exp $
11
+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.362 2008/09/22 14:21:44 tgl Exp $
12
12
*
13
13
*-------------------------------------------------------------------------
14
14
*/
@@ -232,8 +232,7 @@ static PGconn *makeEmptyPGconn(void);
232
232
static void freePGconn (PGconn * conn );
233
233
static void closePGconn (PGconn * conn );
234
234
static PQconninfoOption * conninfo_parse (const char * conninfo ,
235
- PQExpBuffer errorMessage , bool use_defaults ,
236
- bool * password_from_string );
235
+ PQExpBuffer errorMessage , bool use_defaults );
237
236
static char * conninfo_getval (PQconninfoOption * connOptions ,
238
237
const char * keyword );
239
238
static void defaultNoticeReceiver (void * arg , const PGresult * res );
@@ -377,8 +376,7 @@ connectOptions1(PGconn *conn, const char *conninfo)
377
376
/*
378
377
* Parse the conninfo string
379
378
*/
380
- connOptions = conninfo_parse (conninfo , & conn -> errorMessage , true,
381
- & conn -> pgpass_from_client );
379
+ connOptions = conninfo_parse (conninfo , & conn -> errorMessage , true);
382
380
if (connOptions == NULL )
383
381
{
384
382
conn -> status = CONNECTION_BAD ;
@@ -474,7 +472,6 @@ connectOptions2(PGconn *conn)
474
472
conn -> dbName , conn -> pguser );
475
473
if (conn -> pgpass == NULL )
476
474
conn -> pgpass = strdup (DefaultPassword );
477
- conn -> pgpass_from_client = false;
478
475
}
479
476
480
477
/*
@@ -560,14 +557,12 @@ PQconninfoOption *
560
557
PQconndefaults (void )
561
558
{
562
559
PQExpBufferData errorBuf ;
563
- bool password_from_string ;
564
560
PQconninfoOption * connOptions ;
565
561
566
562
initPQExpBuffer (& errorBuf );
567
563
if (errorBuf .data == NULL )
568
564
return NULL ; /* out of memory already :-( */
569
- connOptions = conninfo_parse ("" , & errorBuf , true,
570
- & password_from_string );
565
+ connOptions = conninfo_parse ("" , & errorBuf , true);
571
566
termPQExpBuffer (& errorBuf );
572
567
return connOptions ;
573
568
}
@@ -668,7 +663,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
668
663
if (conn -> pgpass )
669
664
free (conn -> pgpass );
670
665
conn -> pgpass = strdup (pwd );
671
- conn -> pgpass_from_client = true;
672
666
}
673
667
674
668
/*
@@ -3127,16 +3121,14 @@ PQconninfoOption *
3127
3121
PQconninfoParse (const char * conninfo , char * * errmsg )
3128
3122
{
3129
3123
PQExpBufferData errorBuf ;
3130
- bool password_from_string ;
3131
3124
PQconninfoOption * connOptions ;
3132
3125
3133
3126
if (errmsg )
3134
3127
* errmsg = NULL ; /* default */
3135
3128
initPQExpBuffer (& errorBuf );
3136
3129
if (errorBuf .data == NULL )
3137
3130
return NULL ; /* out of memory already :-( */
3138
- connOptions = conninfo_parse (conninfo , & errorBuf , false,
3139
- & password_from_string );
3131
+ connOptions = conninfo_parse (conninfo , & errorBuf , false);
3140
3132
if (connOptions == NULL && errmsg )
3141
3133
* errmsg = errorBuf .data ;
3142
3134
else
@@ -3152,12 +3144,10 @@ PQconninfoParse(const char *conninfo, char **errmsg)
3152
3144
* left in errorMessage.
3153
3145
* Defaults are supplied (from a service file, environment variables, etc)
3154
3146
* for unspecified options, but only if use_defaults is TRUE.
3155
- * *password_from_string is set TRUE if we got a password from the
3156
- * conninfo string, otherwise FALSE.
3157
3147
*/
3158
3148
static PQconninfoOption *
3159
3149
conninfo_parse (const char * conninfo , PQExpBuffer errorMessage ,
3160
- bool use_defaults , bool * password_from_string )
3150
+ bool use_defaults )
3161
3151
{
3162
3152
char * pname ;
3163
3153
char * pval ;
@@ -3168,8 +3158,6 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
3168
3158
PQconninfoOption * options ;
3169
3159
PQconninfoOption * option ;
3170
3160
3171
- * password_from_string = false; /* default result */
3172
-
3173
3161
/* Make a working copy of PQconninfoOptions */
3174
3162
options = malloc (sizeof (PQconninfoOptions ));
3175
3163
if (options == NULL )
@@ -3326,12 +3314,6 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
3326
3314
free (buf );
3327
3315
return NULL ;
3328
3316
}
3329
-
3330
- /*
3331
- * Special handling for password
3332
- */
3333
- if (strcmp (option -> keyword , "password" ) == 0 )
3334
- * password_from_string = (option -> val [0 ] != '\0' );
3335
3317
}
3336
3318
3337
3319
/* Done with the modifiable input string */
@@ -3597,7 +3579,7 @@ PQconnectionUsedPassword(const PGconn *conn)
3597
3579
{
3598
3580
if (!conn )
3599
3581
return false;
3600
- if (conn -> password_needed && conn -> pgpass_from_client )
3582
+ if (conn -> password_needed )
3601
3583
return true;
3602
3584
else
3603
3585
return false;
0 commit comments