[vpopmail-cvs] vpopmail ChangeLog, 1.180, 1.181 README.vpopmaild, 1.11, 1.12 vpopmaild.c, 1.34, 1.35

[Bill S. <sh...@us...>]

Update of /cvsroot/vpopmail/vpopmail
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27597

Modified Files:
	ChangeLog README.vpopmaild vpopmaild.c 
Log Message:
fix find_domain in vpopmaild:  don't display 'page 0' when a domain doesn't exist

Index: README.vpopmaild
===================================================================
RCS file: /cvsroot/vpopmail/vpopmail/README.vpopmaild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- README.vpopmaild	17 Aug 2007 22:54:54 -0000	1.11
+++ README.vpopmaild	27 Oct 2007 15:39:29 -0000	1.12
@@ -459,12 +459,13 @@
 
 Rights required: SA_ADMIN
 
-Action: Return the page number that the named domain appears on.
-This can be used when you are using list_domains with the optional 
-page and lines_per_page parameters.  If you list the page returned
-by find_domain, the desired domain will appear on that page. It 
-may not be at the top of the page.  The page positions are fixed.
-
+Action: Return the page number that the named domain appears on only if the
+domain exist.  Otherwise, just "." is returned.  This can be used when you are 
+using list_domains with the optional page and lines_per_page parameters.  If 
+you list the page returned by find_domain, the desired domain will appear on 
+that page. It may not be at the top of the page.  The page positions are fixed.
+If no per_page argument is given, it defaults to one item per_page.  Page 
+numbers start at 0.
 
 --------------------------------------------------------------------
 

Index: vpopmaild.c
===================================================================
RCS file: /cvsroot/vpopmail/vpopmail/vpopmaild.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- vpopmaild.c	8 Sep 2007 17:53:26 -0000	1.34
+++ vpopmaild.c	27 Oct 2007 15:39:29 -0000	1.35
@@ -172,7 +172,7 @@
 {2, "Domain", NULL, NULL},
 {2, "user_info", user_info, "user_domain<crlf>" },
 {3, "list_domains", list_domains, "[page per_page]<crlf>" },
-{3, "find_domain", find_domain, "domain per-page<crlf>" },
+{3, "find_domain", find_domain, "domain [per-page]<crlf>" },
 {3, "domain_count", domain_count, "<crlf>" },
 {3, "add_alias_domain", add_alias_domain, "domain alias<crlf>" },
 {3, "add_domain", add_domain, "domain postmaster-password<crlf>" },
@@ -1764,7 +1764,8 @@
   }
 
   if( miss ) {
-    page = 0;
+    snprintf(WriteBuf,sizeof(WriteBuf), "." RET_CRLF);
+    return(0);
   } else if( per_page > 0 ) {
     page = ( count / per_page ) + 1;
   } else {

Index: ChangeLog
===================================================================
RCS file: /cvsroot/vpopmail/vpopmail/ChangeLog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- ChangeLog	19 Oct 2007 07:32:26 -0000	1.180
+++ ChangeLog	27 Oct 2007 15:39:29 -0000	1.181
@@ -2,6 +2,11 @@
 or info related to the entry. <http://sourceforge.net/projects/vpopmail/>
 
 5.4.26 - unreleased
+	Bill Shupp
+	- vpopmaild fix: find_domain should not list 'page 0' when a domain is not
+    found.  Instead, return "." only.  Also indicate in help that per_page is 
+    optional.
+    - update README.vpopmaild to reflect the above.
 
 5.4.25 - Released 9-Oct-2007
 	Rick Widmer, Tom Collins