Log Message:
-----------
fix some hba_config issues
Modified Files:
--------------
pgadmin3/src/ui:
dlgHbaConfig.cpp (r1.5 -> r1.6)
frmHbaConfig.cpp (r1.3 -> r1.4)
pgadmin3/src/utils:
pgconfig.cpp (r1.3 -> r1.4)
Index: frmHbaConfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmHbaConfig.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/frmHbaConfig.cpp -Lsrc/ui/frmHbaConfig.cpp -u -w -r1.3 -r1.4
--- src/ui/frmHbaConfig.cpp
+++ src/ui/frmHbaConfig.cpp
@@no-spam -55,7 +55,7 @@no-spam
if (conn)
{
- serverFileName = conn->ExecuteScalar(wxT("SHOW hba_conf"));
+ serverFileName = conn->ExecuteScalar(wxT("SHOW hba_file"));
if (serverFileName == wxT("unset") || serverFileName.IsEmpty())
serverFileName = wxT("pg_hba.conf");
Index: dlgHbaConfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgHbaConfig.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ui/dlgHbaConfig.cpp -Lsrc/ui/dlgHbaConfig.cpp -u -w -r1.5 -r1.6
--- src/ui/dlgHbaConfig.cpp
+++ src/ui/dlgHbaConfig.cpp
@@no-spam -149,25 +149,26 @@no-spam
wxString dlgHbaConfig::GetHelpPage() const
{
- return wxT("pg/client-authentication");
+ return wxT("client-authentication");
// auth-methods#auth-trust #auth-password #kerberos-auth #auth-ident #auth-pam
}
void dlgHbaConfig::OnAddDatabase(wxCommandEvent& ev)
{
- if (cbDatabase->GetSelection() < 3)
+ int sel = cbDatabase->GetSelection();
+ if (sel < 3)
return;
wxString newDatabase;
if (database == wxT("all") || database == wxT("sameuser") || database == wxT("samegroup") || database.Left(1) == wxT("@no-spam"))
database = wxEmptyString;
- if (cbDatabase->GetSelection() == 3) // file
+ if (sel == 3) // file
newDatabase = wxT("@no-spam");
else
{
- wxString str=cbDatabase->GetValue();
+ wxString str=cbDatabase->GetString(sel);
if (str.Find(' ') >= 0)
str = wxT("\"") + str + wxT("\"");
@@no-spam -201,12 +202,13 @@no-spam
void dlgHbaConfig::OnAddUser(wxCommandEvent& ev)
{
- if (cbUser->GetSelection() < 1)
+ int sel = cbUser->GetSelection();
+ if (sel < 1)
return;
wxString newUser;
- wxString str=cbUser->GetValue();
+ wxString str=cbUser->GetString(sel);
if (str.Left(6) == wxT("group "))
{
if (str.Find(' ', true) > 5)
Index: pgconfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/pgconfig.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/utils/pgconfig.cpp -Lsrc/utils/pgconfig.cpp -u -w -r1.3 -r1.4
--- src/utils/pgconfig.cpp
+++ src/utils/pgconfig.cpp
@@no-spam -540,7 +540,7 @@no-spam
str += tabspace + GetMethod();
- if (connectType >= PGC_IDENT && !option.IsEmpty())
+ if (method >= PGC_IDENT && !option.IsEmpty())
str += tabspace + option;
return str;
[plaintext cvs-2004122117123-diff.txt]
---------------------------(end of broadcast)---------------------------
TIP 2: you can get off all lists at once with the unregister command
(send "unregister YourEmailAddressHere" to majordomo@no-spam