Revert "apply 0005-Create-generic-routine-to-fetch-password-and-valid-u.patch"

afiskon · afiskon · commit 829f96b89756 · 2016-11-10T14:58:15.000+03:00
This reverts commit 736b823.
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
@@ -1,8 +1,8 @@
 /*-------------------------------------------------------------------------
  *
  * crypt.c
- *	  Set of routines to look into the password file and check the
- *	  encrypted password with the one passed in from the frontend.
+ *	  Look into the password file and check the encrypted password with
+ *	  the one passed in from the frontend.
  *
  * Original coding by Todd A. Brandys
  *
@@ -30,25 +30,23 @@
 
 
 /*
- * Fetch information of a given role necessary to check password data,
- * and return STATUS_OK or STATUS_ERROR. In the case of an error,
- * optionally store a palloc'd string at *logdetail that will be sent
- * to the postmaster log (but not the client).
+ * Check given password for given user, and return STATUS_OK or STATUS_ERROR.
+ * In the error case, optionally store a palloc'd string at *logdetail
+ * that will be sent to the postmaster log (but not the client).
  */
 int
-get_role_details(const char *role,
-				 char **password,
-				 TimestampTz *vuntil,
-				 bool *vuntil_null,
+md5_crypt_verify(const Port *port, const char *role, char *client_pass,
 				 char **logdetail)
 {
+	int			retval = STATUS_ERROR;
+	char	   *shadow_pass,
+			   *crypt_pwd;
+	TimestampTz vuntil = 0;
+	char	   *crypt_client_pass = client_pass;
 	HeapTuple	roleTup;
 	Datum		datum;
 	bool		isnull;
 
-	*vuntil = 0;
-	*vuntil_null = true;
-
 	/* Get role info from pg_authid */
 	roleTup = SearchSysCache1(AUTHNAME, PointerGetDatum(role));
 	if (!HeapTupleIsValid(roleTup))
@@ -67,49 +65,22 @@ get_role_details(const char *role,
 							  role);
 		return STATUS_ERROR;	/* user has no password */
 	}
-	*password = TextDatumGetCString(datum);
+	shadow_pass = TextDatumGetCString(datum);
 
 	datum = SysCacheGetAttr(AUTHNAME, roleTup,
 							Anum_pg_authid_rolvaliduntil, &isnull);
 	if (!isnull)
-	{
-		*vuntil = DatumGetTimestampTz(datum);
-		*vuntil_null = false;
-	}
+		vuntil = DatumGetTimestampTz(datum);
 
 	ReleaseSysCache(roleTup);
 
-	if (**password == '\0')
+	if (*shadow_pass == '\0')
 	{
 		*logdetail = psprintf(_("User \"%s\" has an empty password."),
 							  role);
 		return STATUS_ERROR;	/* empty password */
 	}
 
-	return STATUS_OK;
-}
-
-/*
- * Check given password for given user, and return STATUS_OK or STATUS_ERROR.
- * In the error case, optionally store a palloc'd string at *logdetail
- * that will be sent to the postmaster log (but not the client).
- */
-int
-md5_crypt_verify(const Port *port, const char *role, char *client_pass,
-				 char **logdetail)
-{
-	int			retval = STATUS_ERROR;
-	char	   *shadow_pass,
-			   *crypt_pwd;
-	TimestampTz vuntil;
-	char	   *crypt_client_pass = client_pass;
-	bool		vuntil_null;
-
-	/* fetch details about role needed for password checks */
-	if (get_role_details(role, &shadow_pass, &vuntil, &vuntil_null,
-							  logdetail) != STATUS_OK)
-		return STATUS_ERROR;
-
 	/*
 	 * Compare with the encrypted or plain password depending on the
 	 * authentication method being used for this connection.  (We do not
@@ -181,7 +152,7 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass,
 		/*
 		 * Password OK, now check to be sure we are not past rolvaliduntil
 		 */
-		if (vuntil_null)
+		if (isnull)
 			retval = STATUS_OK;
 		else if (vuntil < GetCurrentTimestamp())
 		{
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
@@ -15,8 +15,6 @@
 
 #include "libpq/libpq-be.h"
 
-extern int get_role_details(const char *role, char **password,
-				 TimestampTz *vuntil, bool *vuntil_null, char **logdetail);
 extern int md5_crypt_verify(const Port *port, const char *role,
 				 char *client_pass, char **logdetail);
 
