diff options
| author | Ric Aleshire <Ric.Aleshire@Sun.COM> | 2010-01-19 17:08:59 -0800 |
|---|---|---|
| committer | Ric Aleshire <Ric.Aleshire@Sun.COM> | 2010-01-19 17:08:59 -0800 |
| commit | 7b0bedd42192a2f6bcd6fc4b637d23892303a962 (patch) | |
| tree | 6bc838cdec8da8a96aa178940ef695af3a5eb816 /usr/src/lib/libtsnet/common/tsol_sgetzcent.c | |
| parent | 7e749adb01c386454877ad532459e92a9f19a702 (diff) | |
| download | illumos-joyent-7b0bedd42192a2f6bcd6fc4b637d23892303a962.tar.gz | |
6811288 secdb.h contains discrepancies between __STDC__ and non-__STDC__ declarations.
6828718 tninfo uses obsolete label translation interfaces
6828671 libtsnet uses obsolete label translation interfaces
Diffstat (limited to 'usr/src/lib/libtsnet/common/tsol_sgetzcent.c')
| -rw-r--r-- | usr/src/lib/libtsnet/common/tsol_sgetzcent.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/src/lib/libtsnet/common/tsol_sgetzcent.c b/usr/src/lib/libtsnet/common/tsol_sgetzcent.c index cfbc70ba34..203a201067 100644 --- a/usr/src/lib/libtsnet/common/tsol_sgetzcent.c +++ b/usr/src/lib/libtsnet/common/tsol_sgetzcent.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * From "tsol_tndb_parser.c 7.24 01/09/05 SMI; TSOL 2.x" @@ -40,8 +40,6 @@ * Such things are indicative of typing errors, not intentional configuration. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <ctype.h> #include <stdlib.h> #include <stddef.h> @@ -157,6 +155,7 @@ tsol_zcent_t * tsol_sgetzcent(const char *instr, int *errp, char **errstrp) { int err; + m_label_t *slp; char *errstr; tsol_zcent_t *zc; const char *nextf; @@ -215,7 +214,10 @@ tsol_sgetzcent(const char *instr, int *errp, char **errstrp) *errp = LTSNET_NO_LABEL; goto err_ret; } - if (stobsl(fieldbuf, &zc->zc_label, NO_CORRECTION, &err) == 0) { + + slp = &zc->zc_label; + if (str_to_label(fieldbuf, &slp, MAC_LABEL, L_NO_CORRECTION, NULL) + != 0) { *errstrp = (char *)instr; *errp = LTSNET_ILL_LABEL; goto err_ret; |