svn commit: samba r3275 - in branches/SAMBA_3_0/source/client: .

[jra at samba.org]

Author: jra
Date: 2004-10-27 00:52:12 +0000 (Wed, 27 Oct 2004)
New Revision: 3275

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/client&rev=3275&nolog=1

Log:
Fix from Michael Sweet <mike at easysw.com> for bug #1892.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/client/smbspool.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/smbspool.c
===================================================================
--- branches/SAMBA_3_0/source/client/smbspool.c	2004-10-27 00:51:57 UTC (rev 3274)
+++ branches/SAMBA_3_0/source/client/smbspool.c	2004-10-27 00:52:12 UTC (rev 3275)
@@ -118,13 +118,13 @@
   * Find the URI...
   */
 
-  if (strncmp(argv[0], "smb://", 6) == 0)
+  if (getenv("DEVICE_URI") != NULL)
+    strncpy(uri, getenv("DEVICE_URI"), sizeof(uri) - 1);
+  else if (strncmp(argv[0], "smb://", 6) == 0)
     strncpy(uri, argv[0], sizeof(uri) - 1);
-  else if (getenv("DEVICE_URI") != NULL)
-    strncpy(uri, getenv("DEVICE_URI"), sizeof(uri) - 1);
   else
   {
-    fputs("ERROR: No device URI found in argv[0] or DEVICE_URI environment variable!\n", stderr);
+    fputs("ERROR: No device URI found in DEVICE_URI environment variable or argv[0] !\n", stderr);
     return (1);
   }