Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 6423d4eff1e10458edf4735de01b60c5 > files > 4

bridge-utils-1.1-3.el5.src.rpm

commit cf06742ec8fd4e7ac7d393ebe093839379aa3f46
Author: Santiago Garcia Mantinan <bridge@manty.net>
Date:   Sat Aug 26 19:41:28 2006 +0200

    patch for a message bug
    
    Hi!
    
    Jens Seidel reported a bug to Debian about a wrong message on brctl, you can
    see it at http://bugs.debian.org/383938, it is kind of the continuation of
    the ENODEV bug #348617 that was already patched by Stephen on the git.
    
    I have applied the same solution that Stephen applied for the first one,
    follows the patch against git plus a minor exclamation mark modification I
    did so that all ENODEV messages were exclamative (Stephen patch had missed
    that mark).
    
    Regards...
    --
    Manty/BestiaTester -> http://manty.net
    
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c
index a05d5b1..c93dd55 100644
--- a/brctl/brctl_cmd.c
+++ b/brctl/brctl_cmd.c
@@ -99,7 +99,7 @@ static int br_cmd_addif(int argc, char *
 			if (if_nametoindex(ifname) == 0)
 				fprintf(stderr, "interface %s does not exist!\n", ifname);
 			else
-				fprintf(stderr, "bridge %s does not exist\n", brname);
+				fprintf(stderr, "bridge %s does not exist!\n", brname);
 			break;
 
 		case EBUSY:
@@ -139,8 +139,10 @@ static int br_cmd_delif(int argc, char *
 			continue;
 
 		case ENODEV:
-			fprintf(stderr, "interface %s does not exist!\n", 
-				ifname);
+			if (if_nametoindex(ifname) == 0)
+				fprintf(stderr, "interface %s does not exist!\n", ifname);
+			else
+				fprintf(stderr, "bridge %s does not exist!\n", brname);
 			break;
 
 		case EINVAL: