postgres.git / summary / log / commit / refs

commit    6b9e742458df2256ca611b7aeef7ede72ca943f5
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Sat Jun 15 19:39:33 2002 +0000

    The macaddr datatype understands most formats of MAC address, except 12
    hex digits with no separators, eg 00AABBCCDDEE. This is easily remedied
    with the following patch (against 7.2.1):
    
    Mike Wyer


 src/backend/utils/adt/mac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index 0abd3a71e89..a531842205f 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,7 +1,7 @@
 /*
  *	PostgreSQL type definitions for MAC addresses.
  *
- *	$Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.22 2002/03/09 17:35:35 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.23 2002/06/15 19:39:33 momjian Exp $
  */
 
 #include "postgres.h"
@@ -46,6 +46,8 @@ macaddr_in(PG_FUNCTION_ARGS)
 		count = sscanf(str, "%2x%2x%2x-%2x%2x%2x", &a, &b, &c, &d, &e, &f);
 	if (count != 6)
 		count = sscanf(str, "%2x%2x.%2x%2x.%2x%2x", &a, &b, &c, &d, &e, &f);
+	if (count != 6)
+		count = sscanf(str, "%2x%2x%2x%2x%2x%2x", &a, &b, &c, &d, &e, &f);
 
 	if (count != 6)
 		elog(ERROR, "macaddr_in: error in parsing \"%s\"", str);


[parent: cd7be4d9470c]