projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| bc374b85 AM |
1 | Index: lib/fsm.c |
| 2 | =================================================================== | |
| 3 | RCS file: /cvs/devel/rpm/lib/fsm.c,v | |
| 4 | retrieving revision 2.101 | |
| 17518eaa AM |
5 | retrieving revision 2.103 |
| 6 | diff -u -u -r2.101 -r2.103 | |
| bc374b85 | 7 | --- rpm/lib/fsm.c 5 Jan 2004 14:09:47 -0000 2.101 |
| 17518eaa AM |
8 | +++ rpm/lib/fsm.c 10 Jan 2004 18:48:19 -0000 2.103 |
| 9 | @@ -2152,7 +2152,8 @@ | |
| bc374b85 AM |
10 | } |
| 11 | break; | |
| 12 | case FSM_LSETFCON: | |
| 13 | - if (fsm->fcontext == NULL) | |
| 17518eaa AM |
14 | + if (fsm->fcontext == NULL || *fsm->fcontext == '\0' |
| 15 | + || !strcmp(fsm->fcontext, "<<none>>")) | |
| bc374b85 AM |
16 | break; |
| 17 | rc = lsetfilecon(fsm->path, (security_context_t)fsm->fcontext); | |
| 18 | if (_fsm_debug && (stage & FSM_SYSCALL)) | |
| 19 | Index: lib/rpmfi.c | |
| 20 | =================================================================== | |
| 21 | RCS file: /cvs/devel/rpm/lib/rpmfi.c,v | |
| 22 | retrieving revision 2.52 | |
| 23 | retrieving revision 2.54 | |
| 24 | diff -u -u -r2.52 -r2.54 | |
| 25 | --- rpm/lib/rpmfi.c 5 Jan 2004 14:09:47 -0000 2.52 | |
| 26 | +++ rpm/lib/rpmfi.c 9 Jan 2004 23:17:33 -0000 2.54 | |
| 27 | @@ -1593,7 +1593,7 @@ | |
| 28 | fi = rpmfiInit(fi, 0); | |
| 29 | if (fi != NULL) | |
| 30 | while (rpmfiNext(fi) >= 0) { | |
| 31 | - av[ac] = NULL; | |
| 32 | + av[ac] = ""; | |
| 33 | if (fcnb[ac] > 0) { | |
| 34 | av[ac] = t; | |
| 35 | t += fcnb[ac]; | |
| 36 | @@ -1670,7 +1670,7 @@ | |
| 37 | fi = rpmfiInit(fi, 0); | |
| 38 | if (fi != NULL) | |
| 39 | while (rpmfiNext(fi) >= 0) { | |
| 40 | - av[ac] = NULL; | |
| 41 | + av[ac] = ""; | |
| 42 | if (fcnb[ac] > 0) { | |
| 43 | av[ac] = t; | |
| 44 | t += fcnb[ac]; | |
| 212db802 AM |
45 | Index: rpmsx.c |
| 46 | =================================================================== | |
| 47 | RCS file: /cvs/devel/rpm/lib/rpmsx.c,v | |
| 48 | retrieving revision 2.6 | |
| 49 | diff -u -u -r2.6 rpmsx.c | |
| 50 | --- rpm/lib/rpmsx.c 25 Dec 2003 23:00:45 -0000 2.6 | |
| 51 | +++ rpm/lib/rpmsx.c 17 Jan 2004 17:52:19 -0000 | |
| 52 | @@ -316,7 +316,10 @@ | |
| 53 | /*@=branchstate@*/ | |
| 54 | ||
| 55 | if ((fp = fopen(fn, "r")) == NULL) { | |
| 56 | - perror(fn); | |
| 57 | + if (ENOENT == errno) | |
| 7681b472 | 58 | + fprintf(stderr, _("Parsing SELinux file contexts skipped: %s: %s\n"), fn, strerror(errno)); |
| 212db802 AM |
59 | + else |
| 60 | + perror(fn); | |
| 61 | return -1; | |
| 62 | } | |
| 63 | ||
| 9480c526 JB |
64 | --- rpm-4.3/po/pl.po.orig 2004-02-01 20:33:57.000000000 +0100 |
| 65 | +++ rpm-4.3/po/pl.po 2004-02-01 20:51:30.760959200 +0100 | |
| 66 | @@ -2887,6 +2887,11 @@ | |
| 67 | msgid "Unable to open %s for reading: %s.\n" | |
| 68 |