]>
Commit | Line | Data |
---|---|---|
25b9ae01 JB |
1 | diff -ur ticket-applet--mainline--0.3--patch-26/src/krb-util.c ticket-applet--mainline--0.3--patch-26.mrk/src/krb-util.c |
2 | --- ticket-applet--mainline--0.3--patch-26/src/krb-util.c 2003-10-11 20:04:06.000000000 +0200 | |
3 | +++ ticket-applet--mainline--0.3--patch-26.mrk/src/krb-util.c 2005-04-04 21:32:10.640633958 +0200 | |
4 | @@ -43,19 +43,19 @@ | |
5 | char * progname = "ticket_applet"; | |
6 | ||
7 | ||
8 | -#define clear_error(e) memset((char *) &e, 0, sizeof(krb_error)) | |
9 | +#define clear_error(e) memset((char *) &e, 0, sizeof(_krb_error)) | |
10 | ||
11 | -static krb_error | |
12 | +static _krb_error | |
13 | make_error(krb5_error_code code) | |
14 | { | |
15 | - krb_error error; | |
16 | + _krb_error error; | |
17 | ||
18 | strncpy(error.message, error_message(code), 255); | |
19 | error.code = code; | |
20 | return error; | |
21 | } | |
22 | ||
23 | -krb_error | |
24 | +_krb_error | |
25 | krb_get_tickets(char *princ, char *pass) | |
26 | { | |
27 | krb5_context context; | |
28 | @@ -68,7 +68,7 @@ | |
29 | CREDENTIALS v4_creds; | |
30 | #endif | |
31 | ||
32 | - krb_error error; | |
33 | + _krb_error error; | |
34 | clear_error(error); | |
35 | ||
36 | if ((code = krb5_init_context(&context))) { | |
37 | @@ -149,7 +149,7 @@ | |
38 | } | |
39 | ||
40 | ||
41 | -krb_error | |
42 | +_krb_error | |
43 | krb_time_left(int * t) | |
44 | { | |
45 | krb5_context context; | |
46 | @@ -158,8 +158,8 @@ | |
47 | krb5_principal me = NULL; | |
48 | krb5_cc_cursor cur; | |
49 | krb5_creds creds; | |
50 | - krb5_int32 now; | |
51 | - krb_error error; | |
52 | + int now; | |
53 | + _krb_error error; | |
54 | ||
55 | *t = 0; | |
56 | clear_error(error); | |
57 | @@ -220,7 +220,7 @@ | |
58 | int t; | |
59 | int min,hr; | |
60 | char *msg; | |
61 | - krb_error error; | |
62 | + _krb_error error; | |
63 | ||
64 | error = krb_time_left(&t); | |
65 | ||
66 | diff -ur ticket-applet--mainline--0.3--patch-26/src/krb-util.h ticket-applet--mainline--0.3--patch-26.mrk/src/krb-util.h | |
67 | --- ticket-applet--mainline--0.3--patch-26/src/krb-util.h 2003-10-11 20:04:06.000000000 +0200 | |
68 | +++ ticket-applet--mainline--0.3--patch-26.mrk/src/krb-util.h 2005-04-04 21:32:10.640633958 +0200 | |
69 | @@ -24,13 +24,13 @@ | |
70 | #include <krb5.h> | |
71 | #include <string.h> | |
72 | ||
73 | -typedef struct _krb_error { | |
74 | +typedef struct __krb_error { | |
75 | krb5_error_code code; | |
76 | char message[255]; | |
77 | -} krb_error; | |
78 | +} _krb_error; | |
79 | ||
80 | -krb_error krb_get_tickets(char *princ, char *pass); | |
81 | -krb_error krb_time_left(int *t); | |
82 | +_krb_error krb_get_tickets(char *princ, char *pass); | |
83 | +_krb_error krb_time_left(int *t); | |
84 | char *krb_time_left_as_string(void); | |
85 | ||
86 | #ifdef DO_KRBAFS | |
87 | diff -ur ticket-applet--mainline--0.3--patch-26/src/renew.c ticket-applet--mainline--0.3--patch-26.mrk/src/renew.c | |
88 | --- ticket-applet--mainline--0.3--patch-26/src/renew.c 2003-10-11 20:04:06.000000000 +0200 | |
89 | +++ ticket-applet--mainline--0.3--patch-26.mrk/src/renew.c 2005-04-04 21:32:10.641633749 +0200 | |
90 | @@ -45,7 +45,7 @@ | |
91 | gchar *password; | |
92 | gchar *princ; | |
93 | gchar *user; | |
94 | - krb_error error; | |
95 | + _krb_error error; | |
96 | char error_msg[256]; | |
97 | ||
98 | password = gtk_editable_get_chars(GTK_EDITABLE(ad->pass_entry), |