From 3e11acb476a833d645e323a6fdbec93fb02f6f75 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Mon, 19 Nov 2007 01:00:51 +0000 Subject: [PATCH] Nicer error messages --- ldap-server/add.cgi | 2 +- ldap-server/add_browser.cgi | 6 +++--- ldap-server/add_form.cgi | 2 +- ldap-server/delete_browser.cgi | 6 +++--- ldap-server/edit_browser.cgi | 2 +- ldap-server/ldap-server-lib.pl | 6 +++--- ldap-server/rename_browser.cgi | 2 +- ldap-server/save_browser.cgi | 6 +++--- ldap-server/sdelete_browser.cgi | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ldap-server/add.cgi b/ldap-server/add.cgi index 59419f42c..26aa2cfc9 100644 --- a/ldap-server/add.cgi +++ b/ldap-server/add.cgi @@ -27,7 +27,7 @@ $dn .= ", $in{'base'}" if ($in{'base'}); # Check for a clash $rv = $ldap->search(base => $dn, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if ($rv && !$rv->code) { ($clash) = $rv->all_entries; $clash && &error(&text('oadd_eclash', "$dn")); diff --git a/ldap-server/add_browser.cgi b/ldap-server/add_browser.cgi index bac46ed9f..24d33cde5 100644 --- a/ldap-server/add_browser.cgi +++ b/ldap-server/add_browser.cgi @@ -10,9 +10,9 @@ ref($ldap) || &error($ldap); # Get the base object $rv = $ldap->search(base => $in{'base'}, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if (!$rv || $rv->code) { - &error($rv ? $rv->code : "Unknown error"); + &error(&ldap_error($rv)); } ($bo) = $rv->all_entries; $bo || &error(&text('save_ebase', "$in{'base'}")); @@ -25,7 +25,7 @@ $rv = $ldap->modify($bo->dn(), if (!$rv || $rv->code) { &error(&text('add_emodify', "".$bo->dn()."", "$in{'add'}", - $rv ? $rv->code : "Unknown error")); + &ldap_error($rv))); } # Return to object diff --git a/ldap-server/add_form.cgi b/ldap-server/add_form.cgi index f9617ba58..df3fd14a3 100644 --- a/ldap-server/add_form.cgi +++ b/ldap-server/add_form.cgi @@ -10,7 +10,7 @@ if ($in{'clone'}) { # Get original object $rv = $ldap->search(base => $in{'base'}, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if (!$rv || $rv->code) { &error(&text('oadd_eget', "$in{'base'}", &ldap_error($rv))); diff --git a/ldap-server/delete_browser.cgi b/ldap-server/delete_browser.cgi index fc68fc26b..afeb448ab 100644 --- a/ldap-server/delete_browser.cgi +++ b/ldap-server/delete_browser.cgi @@ -12,9 +12,9 @@ ref($ldap) || &error($ldap); # Get the base object $rv = $ldap->search(base => $in{'base'}, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if (!$rv || $rv->code) { - &error($rv ? $rv->code : "Unknown error"); + &error(&ldap_error($rv)); } ($bo) = $rv->all_entries; $bo || &error(&text('save_ebase', "$in{'base'}")); @@ -24,7 +24,7 @@ $rv = $ldap->modify($bo->dn(), delete => \@d); if (!$rv || $rv->code) { &error(&text('delete_emodify', "".$bo->dn()."", scalar(@d), - $rv ? $rv->code : "Unknown error")); + &ldap_error($rv))); } # Return to object diff --git a/ldap-server/edit_browser.cgi b/ldap-server/edit_browser.cgi index 35386963f..a90e9db16 100755 --- a/ldap-server/edit_browser.cgi +++ b/ldap-server/edit_browser.cgi @@ -164,7 +164,7 @@ else { print &ui_tabs_start_tab("browser", "attrs"); $rv2 = $ldap->search(base => $base, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); ($bo) = $rv2->all_entries; @attrs = sort { lc($a) cmp lc($b) } $bo->attributes(); if (@attrs) { diff --git a/ldap-server/ldap-server-lib.pl b/ldap-server/ldap-server-lib.pl index d8072efb2..bb9e7c764 100644 --- a/ldap-server/ldap-server-lib.pl +++ b/ldap-server/ldap-server-lib.pl @@ -74,7 +74,7 @@ foreach $ssl (@ssls) { } else { return &text('connect_essl', "$server", - $@ ? %@ : $mesg ? $mesg->code : "Unknown error"); + $@ ? %@ : &ldap_error($mesg)); } } } @@ -84,7 +84,7 @@ $ldap || return "This can't happen!"; local $mesg = $ldap->bind(dn => $user, password => $pass); if (!$mesg || $mesg->code) { return &text('connect_elogin', "$server", "$user", - $mesg ? $mesg->error : "Unknown error"); + &ldap_error($mesg)); } $connect_ldap_db = $ldap; @@ -296,7 +296,7 @@ if (!$rv) { return $text{'euknown'}; } elsif ($rv->code) { - return "".$rv->code; + return $rv->error || "Code ".$rv->code; } else { return undef; diff --git a/ldap-server/rename_browser.cgi b/ldap-server/rename_browser.cgi index 70249675b..c8124feb2 100755 --- a/ldap-server/rename_browser.cgi +++ b/ldap-server/rename_browser.cgi @@ -10,7 +10,7 @@ ref($ldap) || &error($ldap); # Get the object $rv = $ldap->search(base => $in{'old'}, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if (!$rv || $rv->code) { &error(&ldap_error($rv)); } diff --git a/ldap-server/save_browser.cgi b/ldap-server/save_browser.cgi index 5817b593c..47133bff0 100644 --- a/ldap-server/save_browser.cgi +++ b/ldap-server/save_browser.cgi @@ -10,9 +10,9 @@ ref($ldap) || &error($ldap); # Get the base object $rv = $ldap->search(base => $in{'base'}, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if (!$rv || $rv->code) { - &error($rv ? $rv->code : "Unknown error"); + &error(&ldap_error($rv)); } ($bo) = $rv->all_entries; $bo || &error(&text('save_ebase', "$in{'base'}")); @@ -26,7 +26,7 @@ $rv = $ldap->modify($bo->dn(), if (!$rv || $rv->code) { &error(&text('save_emodify', "".$bo->dn()."", "$in{'edit'}", - $rv ? $rv->code : "Unknown error")); + &ldap_error($rv))); } # Return to object diff --git a/ldap-server/sdelete_browser.cgi b/ldap-server/sdelete_browser.cgi index 56b5b382b..e7830ac48 100644 --- a/ldap-server/sdelete_browser.cgi +++ b/ldap-server/sdelete_browser.cgi @@ -13,7 +13,7 @@ ref($ldap) || &error($ldap); foreach $d (@d) { $rv = $ldap->search(base => $d, filter => '(objectClass=*)', - score => 'base'); + scope => 'base'); if (!$rv || $rv->code) { &error(&ldap_error($rv)); }