summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-19 19:59:29 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-19 19:59:29 +0000
commit1033906853684e539f441f7ff3f3a18529c5c6ae (patch)
tree6503c0bdbac45db9c3ab0eac299ad4968ab143be /sbin
parenta5714436decc5b9c3a04ba74c68754e3a590dd43 (diff)
./sa.h: Merge with EOM 1.47
Remove SA_FLAG_REPLACED settings from various parts in preparation of a grand unified setting in exchange_finalize. Fix sa_mark_replaced to not release a referance to the sa, and adjust the API as it won't get called as a finalize func anymore.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/sa.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/sa.h b/sbin/isakmpd/sa.h
index d8555ce06eb..b8fb5e1a099 100644
--- a/sbin/isakmpd/sa.h
+++ b/sbin/isakmpd/sa.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: sa.h,v 1.10 1999/04/05 21:02:32 niklas Exp $ */
-/* $EOM: sa.h,v 1.46 1999/04/05 08:09:22 niklas Exp $ */
+/* $OpenBSD: sa.h,v 1.11 1999/04/19 19:59:28 niklas Exp $ */
+/* $EOM: sa.h,v 1.47 1999/04/13 14:22:58 niklas Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -179,7 +179,7 @@ extern struct sa *sa_lookup (u_int8_t *, u_int8_t *);
extern struct sa *sa_lookup_by_header (u_int8_t *, int);
extern struct sa *sa_lookup_by_name (char *, int);
extern struct sa *sa_lookup_from_icookie (u_int8_t *);
-extern void sa_mark_replaced (struct sa *, int);
+extern void sa_mark_replaced (struct sa *);
extern void sa_reference (struct sa *);
extern void sa_release (struct sa *);
extern void sa_soft_expire (struct sa *);